Browse Source

UserScript fix

pull/70/head
Ruud 13 years ago
parent
commit
74058964a7
  1. 6
      couchpotato/static/scripts/couchpotato.js
  2. 2
      couchpotato/templates/_desktop.html

6
couchpotato/static/scripts/couchpotato.js

@ -87,7 +87,7 @@ var CouchPotato = new Class({
if(current_url == self.current_url)
return;
self.route.parse(url);
self.route.parse();
var page_name = self.route.getPage().capitalize();
var action = self.route.getAction();
var params = self.route.getParams();
@ -190,10 +190,10 @@ var Route = new Class({
self.defaults = defaults
},
parse: function(url_string){
parse: function(){
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 url = current.split('/')

2
couchpotato/templates/_desktop.html

@ -81,7 +81,7 @@
File.Type.setup({{ fireEvent('file.types', single = True)|tojson|safe }});
App.setup({
'base_url': {{ request.path|tojson|safe }},
'base_url': {{ url_for('web.index')|tojson|safe }},
'args': {{ env.get('args')|tojson|safe }},
'options': "{{ env.get('options')|safe }}",
'app_dir': {{ env.get('app_dir')|tojson|safe }},

Loading…
Cancel
Save