dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Post hostname with bookmark

Browse Source
This commit is contained in:
Ruud
2012-03-18 17:44:20 +01:00
parent 4cca9fbb6a
commit 7dd89247f2
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/userscript/bookmark.js
+1 -1
View File
@@ -34,7 +34,7 @@ var addUserscript = function() {
var e = document.createElement('script'); var e = document.createElement('script');
e.setAttribute('type', 'text/javascript'); e.setAttribute('type', 'text/javascript');
e.setAttribute('charset', 'UTF-8'); e.setAttribute('charset', 'UTF-8');
e.setAttribute('src', '{{host}}/userscript.get/couchpotato.js?r=' + Math.random() * 99999999); e.setAttribute('src', '{{host}}couchpotato.js?r=' + Math.random() * 99999999);
document.body.appendChild(e) document.body.appendChild(e)
} }
if(isCorrectUrl()) if(isCorrectUrl())
couchpotato/core/plugins/userscript/main.py
+1 -1
View File
@@ -31,7 +31,7 @@ class Userscript(Plugin):
params = { params = {
'includes': fireEvent('userscript.get_includes', merge = True), 'includes': fireEvent('userscript.get_includes', merge = True),
'excludes': fireEvent('userscript.get_excludes', merge = True), 'excludes': fireEvent('userscript.get_excludes', merge = True),
'host': fireEvent('app.api_url', single = True) 'host': getParam('host', None),
} }
return self.renderTemplate(__file__, 'bookmark.js', **params) return self.renderTemplate(__file__, 'bookmark.js', **params)
couchpotato/core/plugins/userscript/static/userscript.js
+5 -2
View File
@@ -72,6 +72,8 @@ var UserscriptSettingTab = new Class({
catch(e){ catch(e){
userscript = Browser.chrome === true; userscript = Browser.chrome === true;
} }
var host_url = window.location.protocol + '//' + window.location.host;
self.settings.createGroup({ self.settings.createGroup({
'name': 'userscript', 'name': 'userscript',
@@ -87,8 +89,9 @@ var UserscriptSettingTab = new Class({
new Element('a.button.green', { new Element('a.button.green', {
'text': '+CouchPotato', 'text': '+CouchPotato',
'href': "javascript:void((function(){var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('charset','UTF-8');e.setAttribute('src','" + 'href': "javascript:void((function(){var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('charset','UTF-8');e.setAttribute('src','" +
window.location.protocol + '//' + window.location.host + Api.createUrl('userscript.bookmark') + host_url + Api.createUrl('userscript.bookmark') +
"?r='+Math.random()*99999999);document.body.appendChild(e)})());", "?host="+ encodeURI(host_url + Api.createUrl('userscript.get')) +
"&r='+Math.random()*99999999);document.body.appendChild(e)})());",
'target': '', 'target': '',
'events': { 'events': {
'click': function(e){ 'click': function(e){