0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

fix URL controller

Browse source
This commit is contained in:
rolux 2013-03-04 15:24:20 +00:00
parent 1a83a8ff28
commit cf2b9134f5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
static/js/pandora/URL.js
View file

@ -369,7 +369,9 @@ pandora.URL = (function() {
// on page load, this sets the state from the URL // on page load, this sets the state from the URL
// can also be used to parse a URL // can also be used to parse a URL
that.parse = function(url, callback) { that.parse = function(url, callback) {
if (arguments.length == 1) { if (arguments.length == 2) {
self.URL.parse(url, callback);
} else {
callback = arguments[0]; callback = arguments[0];
url = null; url = null;
if (document.location.pathname.slice(0, 4) == 'url=') { if (document.location.pathname.slice(0, 4) == 'url=') {
@ -380,8 +382,6 @@ pandora.URL = (function() {
setState(state, callback); setState(state, callback);
}); });
} }
} else {
self.URL.parse(url, callback);
} }
return that; return that;
}; };