From c81416bdd2e3da1cd96eb4a8c182c13d7b4af79a Mon Sep 17 00:00:00 2001 From: rolux Date: Wed, 5 Feb 2014 13:38:36 +0000 Subject: [PATCH] update Manage Personal ... menu --- static/js/folders.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/static/js/folders.js b/static/js/folders.js index 60cbeae7..1e89a787 100644 --- a/static/js/folders.js +++ b/static/js/folders.js @@ -56,9 +56,9 @@ pandora.ui.folders = function(section) { click: function(data) { var $list = pandora.$ui.folderList[folder.id]; // fixme: duplicated - if ([ + if (Ox.contains([ 'newlist', 'newlistfromselection', 'newsmartlist', 'newsmartlistfromresults' - ].indexOf(data.id) > -1) { + ], data.id)) { pandora.addList(data.id.indexOf('smart') > -1, data.id.indexOf('from') > -1); } else if (data.id == 'duplicatelist') { pandora.addList(pandora.user.ui._list); @@ -94,9 +94,8 @@ pandora.ui.folders = function(section) { pandora.$ui.personalListsMenu = Ox.MenuButton({ items: [ { id: 'newedit', title: Ox._('New Edit') }, - // FIXME: properly disable/enable - { id: 'neweditfromselection', title: Ox._('New Edit from Selection'), disabled: true }, - { id: 'newsmartedit', title: Ox._('New Smart Edit'), disabled: true }, + { id: 'neweditfromselection', title: Ox._('New Edit from Selection'), disabled: ui.edit && ui.edits[ui.edit].selection.length }, + { id: 'newsmartedit', title: Ox._('New Smart Edit') }, {}, { id: 'duplicateedit', title: Ox._('Duplicate Selected Edit'), disabled: !ui.edit }, { id: 'editedit', title: Ox._('Edit Selected Edit...'), disabled: !editable }, @@ -112,11 +111,11 @@ pandora.ui.folders = function(section) { if (data.id == 'newedit') { pandora.addEdit(); } else if (data.id == 'neweditfromselection') { - // ... + pandora.addEdit(false, true); } else if (data.id == 'newsmartedit') { - // ... + pandora.addEdit(true, false); } else if (data.id == 'duplicateedit') { - // ... + pandora.addEdit(ui.edit); } else if (data.id == 'editedit') { pandora.ui.listDialog().open(); } else if (data.id == 'deleteedit') {