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

UserScript fix

Browse Source
This commit is contained in:
Ruud
2012-01-23 22:50:34 +01:00
parent 4e4d47d6f8
commit 74058964a7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/static/scripts/couchpotato.js
+3 -3
View File
@@ -87,7 +87,7 @@ var CouchPotato = new Class({
if(current_url == self.current_url) if(current_url == self.current_url)
return; return;
self.route.parse(url); self.route.parse();
var page_name = self.route.getPage().capitalize(); var page_name = self.route.getPage().capitalize();
var action = self.route.getAction(); var action = self.route.getAction();
var params = self.route.getParams(); var params = self.route.getParams();
@@ -190,10 +190,10 @@ var Route = new Class({
self.defaults = defaults self.defaults = defaults
}, },
parse: function(url_string){ parse: function(){
var self = this; var self = this;
var path = History.getPath().replace(App.getOption('base_url'), '/') var path = History.getPath().replace(App.getOption('base_url'), '/').replace(Api.getOption('url'), '/')
var current = path.replace(/^\/+|\/+$/g, '') var current = path.replace(/^\/+|\/+$/g, '')
var url = current.split('/') var url = current.split('/')
couchpotato/templates/_desktop.html
+1 -1
View File
@@ -81,7 +81,7 @@
File.Type.setup({{ fireEvent('file.types', single = True)|tojson|safe }}); File.Type.setup({{ fireEvent('file.types', single = True)|tojson|safe }});
App.setup({ App.setup({
'base_url': {{ request.path|tojson|safe }}, 'base_url': {{ url_for('web.index')|tojson|safe }},
'args': {{ env.get('args')|tojson|safe }}, 'args': {{ env.get('args')|tojson|safe }},
'options': "{{ env.get('options')|safe }}", 'options': "{{ env.get('options')|safe }}",
'app_dir': {{ env.get('app_dir')|tojson|safe }}, 'app_dir': {{ env.get('app_dir')|tojson|safe }},