amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-25 23:09:29 +00:00
Code Issues Projects Releases Wiki Activity

(js) Fix handling of mail labels in Preferences

Browse Source
This commit is contained in:
Francis Lachapelle
2016-03-09 16:08:51 -05:00
parent 9d5de9afb7
commit efc34658ec
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
UI/WebServerResources/js/Preferences/Preferences.service.js
View File

@@ -15,7 +15,7 @@
this.defaultsPromise = Preferences.$$resource.fetch("jsonDefaults").then(function(data) {
// We swap $key -> _$key to avoid an Angular bug (https://github.com/angular/angular.js/issues/6266)
var labels = _.zipObject(_.map(data.SOGoMailLabelsColors, function(value, key) {
var labels = _.fromPairs(_.map(data.SOGoMailLabelsColors, function(value, key) {
if (key.charAt(0) == '$')
return ['_' + key, value];
return [key, value];
@@ -197,7 +197,7 @@
});
// We swap _$key -> $key to avoid an Angular bug (https://github.com/angular/angular.js/issues/6266)
labels = _.zipObject(_.map(preferences.defaults.SOGoMailLabelsColors, function(value, key) {
labels = _.fromPairs(_.map(preferences.defaults.SOGoMailLabelsColors, function(value, key) {
if (key.charAt(0) == '_' && key.charAt(1) == '$') {
// New key, let's take the value and flatten it
if (key.length > 2 && key.charAt(2) == '$') {