From 6e988404d9f176de1510d745483f862aa1309f18 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 9 Dec 2015 19:28:26 -0500 Subject: [PATCH] (js) Make sure some arrays are initialized --- .../js/Preferences/Preferences.service.js | 14 +++++++++++--- .../js/Preferences/PreferencesController.js | 4 ---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js index 46cdce88c..db1bbb577 100644 --- a/UI/WebServerResources/js/Preferences/Preferences.service.js +++ b/UI/WebServerResources/js/Preferences/Preferences.service.js @@ -40,14 +40,14 @@ } else data.Vacation = {}; - if (!angular.isDefined(data.Vacation.autoReplyEmailAddresses) && + if (angular.isUndefined(data.Vacation.autoReplyEmailAddresses) && angular.isDefined(window.defaultEmailAddresses)) data.Vacation.autoReplyEmailAddresses = window.defaultEmailAddresses; - if (!angular.isDefined(data.Vacation.daysBetweenResponse)) + if (angular.isUndefined(data.Vacation.daysBetweenResponse)) data.Vacation.daysBetweenResponse = 7; - if (!angular.isDefined(data.Vacation.endDate)) { + if (angular.isUndefined(data.Vacation.endDate)) { data.Vacation.endDateEnabled = 0; data.Vacation.endDate = new Date(); } @@ -55,6 +55,14 @@ if (data.Forward && data.Forward.forwardAddress) data.Forward.forwardAddress = data.Forward.forwardAddress.join(","); + if (angular.isUndefined(data.SOGoCalendarCategoriesColors)) { + data.SOGoCalendarCategoriesColors = {}; + data.SOGoCalendarCategories = []; + } + + if (angular.isUndefined(data.SOGoContactsCategories)) + data.SOGoContactsCategories = []; + angular.extend(_this.defaults, data); return _this.defaults; diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js index d7b3a0f01..dd7bbff3b 100644 --- a/UI/WebServerResources/js/Preferences/PreferencesController.js +++ b/UI/WebServerResources/js/Preferences/PreferencesController.js @@ -71,10 +71,6 @@ } function addCalendarCategory() { - if (!angular.isDefined(vm.preferences.defaults.SOGoCalendarCategoriesColors)) { - vm.preferences.defaults.SOGoCalendarCategoriesColors = {}; - vm.preferences.defaults.SOGoCalendarCategories = []; - } vm.preferences.defaults.SOGoCalendarCategoriesColors["New category"] = "#aaa"; vm.preferences.defaults.SOGoCalendarCategories.push("New category"); }