0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:adaeb16c6924981d60942b33ae659380b213ed63
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:512f07400d0ca6687bda6ed0164602177a3ffa2f
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "adaeb16c6924981d60942b33ae659380b213ed63" and "512f07400d0ca6687bda6ed0164602177a3ffa2f" have entirely different histories.
adaeb16c69 ... 512f07400d

3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/infoView.js
View file

@ -588,10 +588,6 @@ pandora.ui.infoView = function(data, isMixed) {
pandora.UI.set({infoIconSize: iconSize}); pandora.UI.set({infoIconSize: iconSize});
} }
that.resizeElement = function() {
// overwrite splitpanel resize
};
that.reload = function() { that.reload = function() {
var src = src = '/' + data.id + '/' + ( var src = src = '/' + data.id + '/' + (
ui.icons == 'posters' ? 'poster' : 'icon' ui.icons == 'posters' ? 'poster' : 'icon'

14
static/js/mainMenu.js
View file

@ -291,27 +291,27 @@ pandora.ui.mainMenu = function() {
items: 'Lists' items: 'Lists'
}[ui.section], }[ui.section],
folderKey = folderItems.toLowerCase(), folderKey = folderItems.toLowerCase(),
name = data.id.slice(7).replace(/\t/g, '_'), listName = data.id.slice(7).replace(/\t/g, '_'),
set = {} set = {}
if (ui.section == "items") { if (ui.section == "items") {
set.find = { set.find = {
conditions: [ conditions: [
{key: 'list', value: pandora.user.username + ":" + name, operator: '=='} {key: 'list', value: pandora.user.username + ":" + listName, operator: '=='}
], ],
operator: '&' operator: '&'
} }
} else if (ui.section == "edits") { } else if (ui.section == "edits") {
set.edit = pandora.user.username + ":" + name; set.edit = pandora.user.username + ":" + listName;
} else if (ui.section == "documents") { } else if (ui.section == "documents") {
set.findDocuments = { set.findDocuments = {
conditions: [ conditions: [
{key: 'collection', value: pandora.user.username + ":" + name, operator: '=='} {key: 'collection', value: pandora.user.username + ":" + listName, operator: '=='}
], ],
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) pandora.UI.set(set)
Ox.Request.clearCache('find' + folderItems); Ox.Request.clearCache('find' + folderItems);
pandora.$ui.folderList.personal.reloadList() pandora.$ui.folderList.personal.reloadList()
@ -326,7 +326,7 @@ pandora.ui.mainMenu = function() {
documents: ui._collection, documents: ui._collection,
edits: ui.edit, edits: ui.edit,
items: ui._list items: ui._list
}[ui.section]).split(':').slice(1).join(':'), }[ui.section]).split(':', 2)[1],
set = {}; set = {};
if (ui.section == "items") { if (ui.section == "items") {
set.find = { set.find = {
@ -341,7 +341,7 @@ pandora.ui.mainMenu = function() {
operator: '&' 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) pandora.UI.set(set)
Ox.Request.clearCache('find' + folderItems); Ox.Request.clearCache('find' + folderItems);
pandora.$ui.folderList.personal.reloadList() pandora.$ui.folderList.personal.reloadList()

2
static/js/toolbar.js
View file

@ -95,7 +95,7 @@ pandora.ui.toolbar = function() {
return ['map', 'calendar'].indexOf(pandora.user.ui.listView) > -1 ? 152 : 316; return ['map', 'calendar'].indexOf(pandora.user.ui.listView) > -1 ? 152 : 316;
} }
that.updateListName = function(listId) { that.updateListName = function(listId) {
pandora.$ui.listTitle && pandora.$ui.listTitle.options({title: getListName(listId)}); pandora.$ui.listTitle.options({title: getListName(listId)});
}; };
return that; return that;
}; };