From 71d06ace9f462aaea0da40b2f931bc1e6355a026 Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Tue, 16 Aug 2011 13:41:43 +0000
Subject: [PATCH] fix bug in menu (check if a list exists in user ui prefs
 before accessing its properties)

---
 static/js/pandora/ui/menu.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/static/js/pandora/ui/menu.js b/static/js/pandora/ui/menu.js
index 5aa7540..5ed58f8 100644
--- a/static/js/pandora/ui/menu.js
+++ b/static/js/pandora/ui/menu.js
@@ -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')),