From a9d6e70d38d88f40dd793c83c2299b8d5a08f939 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Fri, 4 Jul 2014 10:30:26 +0000 Subject: selectize/localcache : remove overkill categories sorting (already done in WS) + remove some data (comments, uppercets, etc...) git-svn-id: http://piwigo.org/svn/trunk@28938 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/themes/default/js/LocalStorageCache.js | 52 +++++++++++----------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/admin/themes/default/js/LocalStorageCache.js b/admin/themes/default/js/LocalStorageCache.js index 1733ed85d..4fb1d2860 100644 --- a/admin/themes/default/js/LocalStorageCache.js +++ b/admin/themes/default/js/LocalStorageCache.js @@ -202,7 +202,14 @@ options.loader = function(callback) { $.getJSON(options.rootUrl + 'ws.php?format=json&method=pwg.categories.getAdminList', function(data) { - callback(data.result.categories); + var cats = data.result.categories.map(function(c, i) { + c.pos = i; + delete c['comment']; + delete c['uppercats']; + return c; + }); + + callback(cats); }); }; @@ -218,29 +225,6 @@ CategoriesCache.prototype.selectize = function($target, options) { options = options || {}; - options.filter = function(cats) { - cats.map(function(c) { - c.pos = c.global_rank.split('.'); - }); - - cats.sort(function(a, b) { - var i = 0; - while (a.pos[i] && b.pos[i]) { - if (a.pos[i] != b.pos[i]) { - return a.pos[i] - b.pos[i]; - } - i++; - } - return (!a.pos[i] && b.pos[i]) ? -1 : 1; - }); - - cats.map(function(c, i) { - c.pos = i; - }); - - return cats; - }; - $target.selectize({ valueField: 'id', labelField: 'fullname', @@ -267,12 +251,13 @@ options.loader = function(callback) { $.getJSON(options.rootUrl + 'ws.php?format=json&method=pwg.tags.getAdminList', function(data) { - var tags = data.result.tags; - - for (var i=0, l=tags.length; i