From 460a4217ea2a6af4308d493f9881d86e45d01eff Mon Sep 17 00:00:00 2001 From: rolux Date: Sun, 9 Oct 2011 13:31:46 +0000 Subject: [PATCH] fix default item sort in config json --- pandora/0xdb.json | 2 +- static/js/pandora/URL.js | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pandora/0xdb.json b/pandora/0xdb.json index cc09cc30d..400cf51f6 100644 --- a/pandora/0xdb.json +++ b/pandora/0xdb.json @@ -568,7 +568,7 @@ "icons": "posters", "infoIconSize": 256, "item": "", - "itemSort": [{"key": "clip:position", "operator": "+"}], + "itemSort": [{"key": "position", "operator": "+"}], "itemView": "info", "listColumns": ["title", "director", "country", "year", "language", "runtime", "genre"], "listColumnWidth": {}, diff --git a/static/js/pandora/URL.js b/static/js/pandora/URL.js index bb3be4e19..49a0acb77 100644 --- a/static/js/pandora/URL.js +++ b/static/js/pandora/URL.js @@ -79,10 +79,12 @@ pandora.URL = (function() { state.view = pandora.user.ui.itemView; 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; + if (state.view == 'map') { + 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)