Compare commits

..

No commits in common. "f67026fc77656ec9e985b432b6b4c25793c71c26" and "475a784da55200eba89dd48aaf256c85a1676942" have entirely different histories.

4 changed files with 0 additions and 31 deletions

View file

@ -1204,7 +1204,6 @@
"newsletter": true, "newsletter": true,
"ui": { "ui": {
"annotationsCalendarSize": 128, "annotationsCalendarSize": 128,
"annotationsHighlight": "none",
"annotationsMapSize": 128, "annotationsMapSize": 128,
"annotationsRange": "all", "annotationsRange": "all",
"annotationsSize": 256, "annotationsSize": 256,

View file

@ -1670,7 +1670,6 @@
"newsletter": true, "newsletter": true,
"ui": { "ui": {
"annotationsCalendarSize": 128, "annotationsCalendarSize": 128,
"annotationsHighlight": "none",
"annotationsMapSize": 128, "annotationsMapSize": 128,
"annotationsRange": "all", "annotationsRange": "all",
"annotationsSize": 256, "annotationsSize": 256,

View file

@ -1148,7 +1148,6 @@
"level": "guest", "level": "guest",
"ui": { "ui": {
"annotationsCalendarSize": 128, "annotationsCalendarSize": 128,
"annotationsHighlight": "none",
"annotationsHighlight": false, "annotationsHighlight": false,
"annotationsMapSize": 128, "annotationsMapSize": 128,
"annotationsRange": "position", "annotationsRange": "position",

View file

@ -155,11 +155,6 @@ pandora.ui.folderList = function(id, section) {
{key: 'status', value: 'featured', operator: '='} {key: 'status', value: 'featured', operator: '='}
], operator: '&'}; ], operator: '&'};
} }
var _updateItemsCount = false;
if (data.keys && Ox.contains(data.keys, 'items')) {
data.keys = data.keys.filter(function(key) { return key != 'items' })
_updateItemsCount = true;
}
return pandora.api['find' + folderItems](Ox.extend(data, { return pandora.api['find' + folderItems](Ox.extend(data, {
query: query query: query
}), function(result) { }), function(result) {
@ -167,13 +162,6 @@ pandora.ui.folderList = function(id, section) {
pandora.$ui.mainMenu.updateLists(id, result.data.items); pandora.$ui.mainMenu.updateLists(id, result.data.items);
} }
callback(result); callback(result);
if (result.data.items.length && _updateItemsCount) {
setTimeout(function() {
updateItemsCount(result.data.items.map(function(item) {
return item.id;
}));
}, 500)
}
}); });
}; };
} else { } else {
@ -463,21 +451,5 @@ pandora.ui.folderList = function(id, section) {
} }
} }
function updateItemsCount(ids) {
Ox.serialForEach(ids, function(item, index, items, callback) {
pandora.api['find' + folderItems]({
keys: ['items'],
query: {
conditions: [{key: 'id', value: item, operator: '=='}]
},
range: [0, 1]
}, function(result) {
that.value(item, 'items', result.data.items[0].items);
callback();
})
})
}
return that; return that;
}; };