From 804e3a3c6ffe2e4b322d05da5a5e0822e9caf7e9 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 29 Nov 2010 14:26:10 +0000 Subject: [PATCH] Fixed call to Object.toJSON for Prototype JS 1.7. Monotone-Parent: cf0e281b1ddabaa9d9d2254c68173616e13215d0 Monotone-Revision: 49b01807f1c5d14232f8021564406a02f9736a62 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-11-29T14:26:10 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/MailerUIdTree.js | 2 +- UI/WebServerResources/UIxPreferences.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UI/WebServerResources/MailerUIdTree.js b/UI/WebServerResources/MailerUIdTree.js index f24894591..d37149a64 100644 --- a/UI/WebServerResources/MailerUIdTree.js +++ b/UI/WebServerResources/MailerUIdTree.js @@ -50,7 +50,7 @@ var MailerUIdTreeExtension = { expandedFolders.push(this.aNodes[n].dataname); } } - return expandedFolders.toJSON(); + return Object.toJSON(expandedFolders); }, autoSync: function() { this.config.useCookies = true; diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js index bec8588a3..e6efebd74 100644 --- a/UI/WebServerResources/UIxPreferences.js +++ b/UI/WebServerResources/UIxPreferences.js @@ -45,7 +45,7 @@ function savePreferences(sender) { if (isSieveScriptsEnabled) { var jsonFilters = prototypeIfyFilters(); - $("sieveFilters").setValue(jsonFilters.toJSON()); + $("sieveFilters").setValue(Object.toJSON(jsonFilters)); } saveMailAccounts(); @@ -753,7 +753,7 @@ function saveMailAccounts() { compactMailAccounts(); var mailAccountsJSON = $("mailAccountsJSON"); - mailAccountsJSON.value = mailAccounts.toJSON(); + mailAccountsJSON.value = Object.toJSON(mailAccounts); } function compactMailAccounts() { @@ -930,7 +930,7 @@ function serializeContactsCategories() { values.push(td.allTextContent()); } - $("contactsCategoriesValue").value = values.toJSON(); + $("contactsCategoriesValue").value = Object.toJSON(values); } /* / contact categories */