0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix bug in menu (check if a list exists in user ui prefs before accessing its properties)

Browse source
This commit is contained in:
rlx 2011-08-16 13:41:43 +00:00
parent a14441d971
commit 71d06ace9f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
static/js/pandora/ui/menu.js
View file

@ -72,8 +72,9 @@ pandora.ui.mainMenu = function() {
{ id: 'viewMenu', title: 'View', items: [
{ id: 'movies', title: 'View ' + pandora.site.itemName.plural, items: [
{ group: 'viewmovies', min: 1, max: 1, items: $.map(pandora.site.listViews, function(view, i) {
return $.extend({
checked: pandora.user.ui.lists[pandora.user.ui.list].listView == view.id,
return Ox.extend({
checked: pandora.user.ui.lists[pandora.user.ui.list]
? pandora.user.ui.lists[pandora.user.ui.list].listView == view.id : false,
}, view);
}) },
]},
@ -89,7 +90,7 @@ pandora.ui.mainMenu = function() {
{},
{ id: 'openmovie', title: ['Open ' + pandora.site.itemName.singular, 'Open ' + pandora.site.itemName.plural], disabled: true, items: [
{ group: 'movieview', min: 1, max: 1, items: $.map(pandora.site.itemViews, function(view, i) {
return $.extend({
return Ox.extend({
checked: pandora.user.ui.itemView == view.id,
}, view);
}) },
@ -103,8 +104,9 @@ pandora.ui.mainMenu = function() {
{ id: 'sortMenu', title: 'Sort', items: [
{ id: 'sortmovies', title: 'Sort ' + pandora.site.itemName.plural + ' by', items: [
{ group: 'sortmovies', min: 1, max: 1, items: $.map(pandora.site.sortKeys, function(key, i) {
return $.extend({
checked: pandora.user.ui.lists[pandora.user.ui.list].sort[0].key == key.id,
return Ox.extend({
checked: pandora.user.ui.lists[pandora.user.ui.list]
? pandora.user.ui.lists[pandora.user.ui.list].sort[0].key == key.id : false,
}, key);
}) }
] },
@ -121,7 +123,7 @@ pandora.ui.mainMenu = function() {
{ id: 'findMenu', title: 'Find', items: [
{ id: 'find', title: 'Find', items: [
{ group: 'find', min: 1, max: 1, items: $.map(pandora.site.findKeys, function(key, i) {
return $.extend({
return Ox.extend({
checked: pandora.user.ui.findQuery.conditions.length &&
(pandora.user.ui.findQuery.conditions[0].key == key.id ||
(pandora.user.ui.findQuery.conditions[0].key === '' && key.id == 'all')),