From 712589781f1fd05606ee7fd02364e1a7945c47dc Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 1 Nov 2007 15:04:45 +0000 Subject: [PATCH] Monotone-Parent: cb40a9c82d22aadee4be035334aad9f79c4e019e Monotone-Revision: cb9d1b0c8c179b314855342d6063c5c37d4e3de2 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-11-01T15:04:45 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/generic.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index 5498edf5a..044347e60 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1317,14 +1317,22 @@ function loadPreferences() { var http = createHTTPClient(); http.open("GET", url, false); http.send(""); - if (http.status == 200) - userDefaults = http.responseText.evalJSON(true); + if (http.status == 200) { + if (http.responseText.length > 0) + userDefaults = http.responseText.evalJSON(true); + else + userDefaults = {}; + } url = UserFolderURL + "jsonSettings"; http.open("GET", url, false); http.send(""); - if (http.status == 200) - userSettings = http.responseText.evalJSON(true); + if (http.status == 200) { + if (http.responseText.length > 0) + userSettings = http.responseText.evalJSON(true); + else + userSettings = {}; + } } function onLoadHandler(event) {