map and calendar are clip views too

This commit is contained in:
rolux 2011-09-17 21:04:42 +00:00
commit 69c12f990c
4 changed files with 19 additions and 8 deletions

View file

@ -200,12 +200,17 @@ pandora.ui.mainMenu = function() {
defaultRatio: value == 'posters' ? 5/8 : 1
}).reloadList(true);
} else if (data.id == 'viewmovies') {
var isClipView = pandora.isClipView(value),
wasClipView = pandora.isClipView(pandora.user.ui.lists[pandora.user.ui.list].listView);
pandora.UI.set(['lists', pandora.user.ui.list, 'listView'].join('|'), value);
if (isClipView != wasClipView) {
pandora.$ui.mainMenu.replaceMenu('sortMenu', pandora.getSortMenu());
pandora.$ui.sortSelect.replaceWith(pandora.$ui.sortSelect = pandora.ui.sortSelect());
}
pandora.$ui.viewSelect.options({value: value});
pandora.$ui.contentPanel.replaceElement(1, pandora.$ui.list = pandora.ui.list());
pandora.URL.push('/' + value + '/' + document.location.search);
//pandora.URL.set('/' + value + '/' + document.location.search);
}
},
click: function(data) {

View file

@ -8,7 +8,7 @@ pandora.ui.sortSelect = function() {
});
}),
that;
if (list.listView == 'clip') {
if (pandora.isClipView(list.listView)) {
items = Ox.merge(pandora.site.clipKeys.map(function(key) {
return Ox.extend(Ox.clone(key), {
checked: list.sort[0].key == key.id,

View file

@ -22,10 +22,11 @@ pandora.ui.viewSelect = function() {
.bindEvent({
change: !pandora.user.ui.item ? function(data) {
var view = data.selected[0].id,
wasClipView = pandora.user.ui.lists[pandora.user.ui.list].listView == 'clip';
isClipView = pandora.isClipView(view),
wasClipView = pandora.isClipView(pandora.user.ui.lists[pandora.user.ui.list].listView);
pandora.UI.set(['lists', pandora.user.ui.list, 'listView'].join('|'), view);
pandora.$ui.mainMenu.checkItem('viewMenu_movies_' + view);
if (view == 'clip' || wasClipView) {
if (isClipView != wasClipView) {
pandora.$ui.mainMenu.replaceMenu('sortMenu', pandora.getSortMenu());
pandora.$ui.sortSelect.replaceWith(pandora.$ui.sortSelect = pandora.ui.sortSelect());
}