diff --git a/static/js/infoView.js b/static/js/infoView.js index 2307e109..42f70ce8 100644 --- a/static/js/infoView.js +++ b/static/js/infoView.js @@ -588,10 +588,6 @@ pandora.ui.infoView = function(data, isMixed) { pandora.UI.set({infoIconSize: iconSize}); } - that.resizeElement = function() { - // overwrite splitpanel resize - }; - that.reload = function() { var src = src = '/' + data.id + '/' + ( ui.icons == 'posters' ? 'poster' : 'icon' diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js index 07f608e8..522d9cfa 100644 --- a/static/js/mainMenu.js +++ b/static/js/mainMenu.js @@ -291,27 +291,27 @@ pandora.ui.mainMenu = function() { items: 'Lists' }[ui.section], folderKey = folderItems.toLowerCase(), - name = data.id.slice(7).replace(/\t/g, '_'), + listName = data.id.slice(7).replace(/\t/g, '_'), set = {} if (ui.section == "items") { set.find = { conditions: [ - {key: 'list', value: pandora.user.username + ":" + name, operator: '=='} + {key: 'list', value: pandora.user.username + ":" + listName, operator: '=='} ], operator: '&' } } else if (ui.section == "edits") { - set.edit = pandora.user.username + ":" + name; + set.edit = pandora.user.username + ":" + listName; } else if (ui.section == "documents") { set.findDocuments = { conditions: [ - {key: 'collection', value: pandora.user.username + ":" + name, operator: '=='} + {key: 'collection', value: pandora.user.username + ":" + listName, operator: '=='} ], operator: '&' } } - set['hidden.' + folderKey] = ui.hidden[folderKey].filter(other => { return other != name }) + set['hidden.' + folderKey] = ui.hidden[folderKey].filter(name => { return name != listName }) pandora.UI.set(set) Ox.Request.clearCache('find' + folderItems); pandora.$ui.folderList.personal.reloadList() @@ -326,7 +326,7 @@ pandora.ui.mainMenu = function() { documents: ui._collection, edits: ui.edit, items: ui._list - }[ui.section]).split(':').slice(1).join(':'), + }[ui.section]).split(':', 2)[1], set = {}; if (ui.section == "items") { set.find = { @@ -341,7 +341,7 @@ pandora.ui.mainMenu = function() { operator: '&' }; } - set['hidden.' + folderKey] = Ox.sort(Ox.unique([listName].concat(pandora.user.ui.hidden[folderKey]))) + set['hidden.' + folderKey] = Ox.unique([listName].concat(pandora.user.ui.hidden[folderKey])) pandora.UI.set(set) Ox.Request.clearCache('find' + folderItems); pandora.$ui.folderList.personal.reloadList() diff --git a/static/js/toolbar.js b/static/js/toolbar.js index 6eb0a845..464a7fc1 100644 --- a/static/js/toolbar.js +++ b/static/js/toolbar.js @@ -95,7 +95,7 @@ pandora.ui.toolbar = function() { return ['map', 'calendar'].indexOf(pandora.user.ui.listView) > -1 ? 152 : 316; } that.updateListName = function(listId) { - pandora.$ui.listTitle && pandora.$ui.listTitle.options({title: getListName(listId)}); + pandora.$ui.listTitle.options({title: getListName(listId)}); }; return that; };