From f0cb6ac2b02df9f8c10b380382cdb8f822f123b9 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 8 Mar 2010 16:40:18 +0000 Subject: [PATCH] Monotone-Parent: 9adf735e0d77302071b7cf3311f5304804b3927f Monotone-Revision: 4fca67487156a8b01b5ee792e06e1df078519437 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-03-08T16:40:18 Monotone-Branch: ca.inverse.sogo --- UI/PreferencesUI/UIxPreferences.h | 1 - UI/PreferencesUI/UIxPreferences.m | 28 +------ UI/Templates/PreferencesUI/UIxPreferences.wox | 2 - UI/WebServerResources/UIxPreferences.js | 75 +++++++------------ 4 files changed, 26 insertions(+), 80 deletions(-) diff --git a/UI/PreferencesUI/UIxPreferences.h b/UI/PreferencesUI/UIxPreferences.h index dd8b2549f..f6ffd4f28 100644 --- a/UI/PreferencesUI/UIxPreferences.h +++ b/UI/PreferencesUI/UIxPreferences.h @@ -44,7 +44,6 @@ NSArray *daysOfWeek, *daysBetweenResponsesList; NSArray *sieveFilters; NSMutableDictionary *vacationOptions, *forwardOptions; - BOOL hasChanged, composeMessageTypeHasChanged; } - (NSString *) userLongDateFormat; diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index 7beabbc9a..1ebe687b5 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -81,8 +81,6 @@ ASSIGN (locale, [[WOApplication application] localeForLanguageNamed: language]); ASSIGN (daysOfWeek, [locale objectForKey: NSWeekDayNameArray]); - hasChanged = NO; - composeMessageTypeHasChanged = NO; dd = [user domainDefaults]; if ([dd sieveScriptsEnabled]) @@ -128,16 +126,6 @@ [super dealloc]; } -- (void) setHasChanged: (BOOL) newHasChanged -{ - hasChanged = newHasChanged; -} - -- (BOOL) hasChanged -{ - return hasChanged; -} - - (void) setItem: (NSString *) newItem { ASSIGN (item, newItem); @@ -664,8 +652,6 @@ - (void) setUserComposeMessagesType: (NSString *) newType { - if (![[self userComposeMessagesType] isEqualToString: newType]) - composeMessageTypeHasChanged = YES; [userDefaults setMailComposeMessageType: newType]; } @@ -926,7 +912,6 @@ { id results; WORequest *request; - NSString *method; SOGoDomainDefaults *dd; request = [context request]; @@ -954,18 +939,7 @@ acquire: NO]; [account updateFilters]; - if (composeMessageTypeHasChanged) - // Due to a limitation of CKEDITOR, we reload the page when the user - // changes the composition mode to avoid Javascript errors. - results = self; - else - { - if (hasChanged) - method = @"window.location.reload()"; - else - method = nil; - results = [self jsCloseWithRefreshMethod: method]; - } + results = [self jsCloseWithRefreshMethod: nil]; } else results = self; diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index 4a0bcaa7e..abcf41a22 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -297,8 +297,6 @@ >
- diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js index 087bbeaf7..908bcd344 100644 --- a/UI/WebServerResources/UIxPreferences.js +++ b/UI/WebServerResources/UIxPreferences.js @@ -76,20 +76,6 @@ function prototypeIfyFilters() { } function _setupEvents(enable) { - var widgets = [ "timezone", "shortDateFormat", "longDateFormat", - "timeFormat", "weekStartDay", "dayStartTime", "dayEndTime", - "firstWeek", "messageCheck", "subscribedFoldersOnly", - "language"]; - for (var i = 0; i < widgets.length; i++) { - var widget = $(widgets[i]); - if (widget) { - if (enable) - widget.observe("change", onChoiceChanged); - else - widget.stopObserving("change", onChoiceChanged); - } - } - $("replyPlacementList").observe ("change", onReplyPlacementListChange); $("composeMessagesType").observe ("change", onComposeMessagesTypeChange); @@ -98,13 +84,6 @@ function _setupEvents(enable) { categoriesValue.value = ""; } -function onChoiceChanged(event) { - var hasChanged = $("hasChanged"); - hasChanged.value = "1"; - - _setupEvents(false); -} - function addDefaultEmailAddresses(event) { var defaultAddresses = $("defaultEmailAddresses").value.split(/, */); var addresses = $("autoReplyEmailAddresses").value.trim(); @@ -522,36 +501,32 @@ function onReplyPlacementListChange() { } function onComposeMessagesTypeChange(event) { - var textArea = $('signature'); - - if (event) { - // Due to a limitation of CKEDITOR, we reload the page when the user - // changes the composition mode to avoid Javascript errors. - var saveAndReload = confirm(getLabel("composeMessageChanged")); - if (saveAndReload) - return savePreferences(); - else { - // Restore previous value of composeMessagesType - $("composeMessagesType").stopObserving("change", onComposeMessagesTypeChange); - $("composeMessagesType").value = ((Event.element(event).value == 1)?"0":"1"); - Event.element(event).blur(); - $("composeMessagesType").observe("change", onComposeMessagesTypeChange); - return false; - } - } + // var textArea = $('signature'); - if ($("composeMessagesType").value == 1) { - // HTML mode - CKEDITOR.replace('signature', - { - height: "290px", - toolbar : - [['Bold', 'Italic', '-', 'Link', - 'Font','FontSize','-','TextColor', - 'BGColor'] - ] - } - ); + if ($("composeMessagesType").value == 0) /* text */ { + if (CKEDITOR.instances["signature"]) { + var content = CKEDITOR.instances["signature"].getData(); + var htmlEditorWidget = $('cke_signature'); + htmlEditorWidget.parentNode.removeChild(htmlEditorWidget); + delete CKEDITOR.instances["signature"]; + var textArea = $("signature"); + textArea.value = content; + textArea.style.display = ""; + textArea.style.visibility = ""; + } + } else { + if (!CKEDITOR.instances["signature"]) { + CKEDITOR.replace('signature', + { + height: "290px", + toolbar : + [['Bold', 'Italic', '-', 'Link', + 'Font','FontSize','-','TextColor', + 'BGColor'] + ] + } + ); + } } }