From 78cc8b0d1039e3f33c0d6a20e61731c7985458f5 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 7 Oct 2011 20:35:14 +0000 Subject: [PATCH] See ChangeLog. Monotone-Parent: aa311a74c94078a5b69b3e41fcc28b5fab3a23e0 Monotone-Revision: c4988e0379d3f99f40a98620c2c808a000bc5c58 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-10-07T20:35:14 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ UI/WebServerResources/UIxPreferences.js | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd0368327..bc7c53d97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-10-07 Francis Lachapelle + + * UI/WebServerResources/UIxPreferences.js + (displayAccountSignature): fixed the link to edit the signature + when no signature was defined. + 2011-10-06 Francis Lachapelle * UI/WebServerResources/generic.js (getListIndexForFolder): the diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js index 05148a12a..994d7a2c3 100644 --- a/UI/WebServerResources/UIxPreferences.js +++ b/UI/WebServerResources/UIxPreferences.js @@ -533,7 +533,10 @@ function onMailIdentitySignatureClick(event) { } var identity = this.mailAccount["identities"][0]; var area = $("signature"); - area.value = identity["signature"]; + if (typeof(identity["signature"]) != "undefined") + area.value = identity["signature"]; + else + area.value = ""; dialog.show(); $("bgDialogDiv").show(); if (!CKEDITOR.instances["signature"]) @@ -673,7 +676,9 @@ function displayAccountSignature(mailAccount) { var identity = (mailAccount["identities"] ? mailAccount["identities"][0] : {} ); - var value = identity["signature"].stripTags().unescapeHTML().replace(/^[ \n\r]*/, ""); + var value = identity["signature"]; + if (value && value.length > 0) + value = value.stripTags().unescapeHTML().replace(/^[ \n\r]*/, ""); if (value && value.length > 0) { if (value.length < 30) { actSignatureValue = value;