From 261a17c83b3ff6c85e61802e7623f75668c4156e Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 11 Aug 2016 11:59:43 -0400 Subject: [PATCH] (js) Improve error handling in Preferences service --- UI/WebServerResources/js/Preferences/Preferences.service.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js index f9b488932..839ef8a99 100644 --- a/UI/WebServerResources/js/Preferences/Preferences.service.js +++ b/UI/WebServerResources/js/Preferences/Preferences.service.js @@ -13,7 +13,9 @@ this.defaults = {}; this.settings = {}; - this.defaultsPromise = Preferences.$$resource.fetch("jsonDefaults").then(function(data) { + this.defaultsPromise = Preferences.$$resource.fetch("jsonDefaults").then(function(response) { + var data = response || {}; + // We swap $key -> _$key to avoid an Angular bug (https://github.com/angular/angular.js/issues/6266) var labels = _.fromPairs(_.map(data.SOGoMailLabelsColors, function(value, key) { if (key.charAt(0) == '$')