Author: damoxc
Revision: 5081
Log:
change it so instead of modifying the list at render it uses a
completely seperate list when being run in debug mode
Diff:
Modified: trunk/deluge/ui/web/server.py
===================================================================
--- trunk/deluge/ui/web/server.py 2009-04-18 16:20:07 UTC (rev 5080)
+++ trunk/deluge/ui/web/server.py 2009-04-18 16:30:14 UTC (rev 5081)
@@ -216,6 +216,41 @@
class TopLevel(resource.Resource):
addSlash = True
+ __stylesheets = [
+ "/css/ext-all.css",
+ "/css/xtheme-slate.css",
+ "/css/Spinner.css",
+ "/css/deluge.css"
+ ]
+
+ __scripts = [
+ "/js/mootools-1.2.1-core-yc.js",
+ "/js/ext-mootools-adapter.js",
+ "/js/ext-all.js",
+ "/js/ext-extensions.js",
+ "/gettext.js",
+ "/js/deluge-yc.js"
+ ]
+
+ __debug_scripts = [
+ "/js/mootools-1.2.1-core-yc.js",
+ "/js/ext-mootools-adapter.js",
+ "/js/ext-all-debug.js",
+ "/js/ext-extensions-debug.js",
+ "/gettext.js",
+ "/js/rpc.js",
+ "/js/deluge.js",
+ "/js/deluge-login.js",
+ "/js/deluge-menus.js",
+ "/js/deluge-bars.js",
+ "/js/deluge-connections.js",
+ "/js/deluge-torrents.js",
+ "/js/deluge-details.js",
+ "/js/deluge-add.js",
+ "/js/deluge-preferences.js",
+ "/js/deluge-ui.js"
+ ]
+
def __init__(self):
resource.Resource.__init__(self)
self.putChild("css", LookupResource("Css", rpath("css")))
@@ -229,39 +264,16 @@
self.putChild("render", Render())
self.putChild("themes", static.File(rpath("themes")))
self.putChild("tracker", Tracker())
-
- self.__stylesheets = [
- "/css/ext-all.css",
- "/css/xtheme-slate.css",
- "/css/Spinner.css",
- "/css/deluge.css"
- ]
- self.__scripts = [
- "/js/mootools-1.2.1-core-yc.js",
- "/js/ext-mootools-adapter.js",
- "/js/ext-all.js",
- "/js/Spinner.js",
- "/js/SpinnerStrategy.js",
- "/js/rpc.js",
- "/gettext.js",
- "/js/deluge.js",
- "/js/deluge-ext.js",
- "/js/deluge-login.js",
- "/js/deluge-menus.js",
- "/js/deluge-bars.js",
- "/js/deluge-connections.js",
- "/js/deluge-torrents.js",
- "/js/deluge-details.js",
- "/js/deluge-add.js",
- "/js/deluge-preferences.js",
- "/js/deluge-ui.js"
- ]
-
+
@property
def scripts(self):
return self.__scripts
@property
+ def debug_scripts(self):
+ return self.__debug_scripts
+
+ @property
def stylesheets(self):
return self.__stylesheets
@@ -272,10 +284,11 @@
return resource.Resource.getChild(self, path, request)
def render(self, request):
- scripts = self.scripts[:]
if request.args.get('debug', ['false'])[-1] == 'true':
- i = scripts.index("/js/ext-all.js")
- scripts[i] = "/js/ext-all-debug.js"
+ scripts = self.debug_scripts[:]
+ else:
+ scripts = self.scripts[:]
+
template = Template(filename=rpath("index.html"))
request.setHeader("content-type", "text/html; charset=utf-8")
return template.render(scripts=scripts, stylesheets=self.stylesheets)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
