amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-21 19:35:38 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog.

Browse Source 
Monotone-Parent: 3c7042f2811eba747bdbbd95d698d3f31d66d4a3
Monotone-Revision: ae57634798c522301af45e400fa849c606655634

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-03-14T20:06:16
This commit is contained in:
Francis Lachapelle
2012-03-14 20:06:16 +00:00
parent 1d83b312fc
commit f5aeae8b66
3 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/UIxPreferences.js
+29 -5
View File
@@ -548,8 +548,11 @@ function onMailIdentitySignatureClick(event) {
label,
fields,
"none");
if (Prototype.Browser.IE)
// Overwrite some fixes from iefixes.css
dialog.setStyle({ width: 'auto', marginLeft: 'auto' });
document.body.appendChild(dialog);
dialog.show();
dialogs[dialogId] = dialog;
if ($("composeMessagesType").value != 0) {
@@ -573,14 +576,36 @@ function onMailIdentitySignatureClick(event) {
area.value = identity["signature"];
else
area.value = "";
dialog.show();
$("bgDialogDiv").show();
if (!CKEDITOR.instances["signature"])
if (CKEDITOR.instances["signature"])
focusCKEditor();
else
area.focus();
event.stop();
Event.stop(event);
}
}
function focusCKEditor() {
if (CKEDITOR.status != 'basic_ready')
setTimeout("focusCKEditor()", 100);
else
// CKEditor reports being ready but it's still not focusable;
// we wait for a few more milliseconds
setTimeout("CKEDITOR.instances.signature.focus()", 500);
}
function hideSignature() {
if (CKEDITOR.status != 'basic_ready')
setTimeout("hideSignature()", 100);
else
// CKEditor reports being ready but it's not;
// we wait for a few more milliseconds
setTimeout('disposeDialog("signatureDialog")', 200);
}
function onMailIdentitySignatureOK(event) {
var dialog = $("signatureDialog");
var mailAccount = dialog.mailAccount;
@@ -594,8 +619,7 @@ function onMailIdentitySignatureOK(event) {
: $("signature").value);
identity["signature"] = content;
displayAccountSignature(mailAccount);
dialog.hide();
$("bgDialogDiv").hide();
hideSignature();
dialog.mailAccount = null;
var hasChanged = $("hasChanged");
hasChanged.value = "1";