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

fix for '/@foo' urls

Browse source
This commit is contained in:
rolux 2011-10-09 10:20:36 +00:00
parent f23a480208
commit 106b2a5577
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,14 +36,16 @@ pandora.URL = (function() {
state.view = 'map'; state.view = 'map';
state.span = pandora.user.ui.mapSelection state.span = pandora.user.ui.mapSelection
? '@' + pandora.user.ui.mapSelection : ''; ? '@' + pandora.user.ui.mapSelection : '';
state.sort = pandora.user.ui.sort; state.sort = !pandora.user.ui.item
? pandora.user.ui.listSort : pandora.user.ui.itemSort;
} }
if (!keys || keys.indexOf('mapFind') > -1) { if (!keys || keys.indexOf('mapFind') > -1) {
state.item = pandora.user.ui.item; state.item = pandora.user.ui.item;
state.view = 'map'; state.view = 'map';
state.span = pandora.user.ui.mapFind state.span = pandora.user.ui.mapFind
? '@' + pandora.user.ui.mapFind : ''; ? '@' + pandora.user.ui.mapFind : '';
state.sort = pandora.user.ui.sort; state.sort = !pandora.user.ui.item
? pandora.user.ui.listSort : pandora.user.ui.itemSort;
} }
if (!keys || keys.filter(function(key) { if (!keys || keys.filter(function(key) {
return /^videoPoints/.test(key); return /^videoPoints/.test(key);
@ -77,6 +79,11 @@ pandora.URL = (function() {
state.view = pandora.user.ui.itemView; state.view = pandora.user.ui.itemView;
state.sort = pandora.user.ui.itemSort; state.sort = pandora.user.ui.itemSort;
} }
if (pandora.user.ui.mapSelection) {
state.span = '@' + pandora.user.ui.mapSelection;
} else if (pandora.user.ui.mapFind) {
state.span = '@' + pandora.user.ui.mapFind;
}
/* /*
: pandora.isClipView(pandora.user.ui.itemView) : pandora.isClipView(pandora.user.ui.itemView)
? pandora.user.ui.itemSort : [], ? pandora.user.ui.itemSort : [],