amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-02 21:52:19 +00:00
Code Issues Projects Releases Wiki Activity

(js) Fix ordering of calendars

Browse Source 
Fixes #3931
This commit is contained in:
Francis Lachapelle
2016-12-08 10:17:25 -05:00
parent 4b2b3693c5
commit d0e0d5300a
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Scheduler/Calendar.service.js
+8 -6
View File
@@ -84,7 +84,7 @@
*/
Calendar.$add = function(calendar) {
// Insert new calendar at proper index
var list, sibling, i;
var list, sibling;
if (calendar.isWebCalendar)
list = this.$webcalendars;
@@ -93,13 +93,15 @@
else
list = this.$calendars;
sibling = _.find(list, function(o) {
sibling = _.findIndex(list, function(o, i) {
console.debug(i + ': "' + o.id + '".localeCompare("' + calendar.name + '") = ' + o.name.localeCompare(calendar.name));
return (calendar.id == 'personal' ||
(o.id != 'personal' &&
o.name.localeCompare(calendar.name) === 1));
(o.id != 'personal' && o.name.localeCompare(calendar.name) > 0));
});
i = sibling ? _.indexOf(_.map(list, 'id'), sibling.id) : 1;
list.splice(i, 0, calendar);
if (sibling < 0)
list.push(calendar);
else
list.splice(sibling, 0, calendar);
this.$Preferences.ready().then(function() {
if (Calendar.$Preferences.settings.Calendar.FoldersOrder)