Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue #1567, js from plugins not working with different base setting

Browse Source
This commit is contained in:
Damien Churchill 2011-05-06 22:08:59 +01:00
parent 922e64a07e
commit 5ad21303c6
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deluge/ui/web/js/deluge-all/UI.js
View File

@ -232,7 +232,7 @@ deluge.ui = {
var scripts = (Deluge.debug) ? resources.debug_scripts : resources.scripts; var scripts = (Deluge.debug) ? resources.debug_scripts : resources.scripts;
Ext.each(scripts, function(script) { Ext.each(scripts, function(script) {
Ext.ux.JSLoader({ Ext.ux.JSLoader({
url: script, url: deluge.config.base + script,
onLoad: this.onPluginLoaded, onLoad: this.onPluginLoaded,
pluginName: resources.name pluginName: resources.name
}); });

4
deluge/ui/web/pluginmanager.py
View File

@ -146,7 +146,7 @@ class PluginManager(PluginManagerBase, component.Component):
return return
info = gather_info(plugin) info = gather_info(plugin)
info["name"] = name info["name"] = name
info["scripts"] = ["/js/%s/%s" % (name.lower(), os.path.basename(s)) for s in info["scripts"]] info["scripts"] = ["js/%s/%s" % (name.lower(), os.path.basename(s)) for s in info["scripts"]]
info["debug_scripts"] = ["/js/%s/%s" % (name.lower(), os.path.basename(s)) for s in info["debug_scripts"]] info["debug_scripts"] = ["js/%s/%s" % (name.lower(), os.path.basename(s)) for s in info["debug_scripts"]]
del info["script_directories"] del info["script_directories"]
return info return info