Monotone-Parent: 3fa7e256bafe25f933cbd83e48a106452288b415

Monotone-Revision: d5dd8c43fa224e4e1e1c3f565305173fb41d4521

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-03-25T20:17:50
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,10 @@
+2010-03-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/PreferencesUI/UIxPreferences.m (-setHasChanged:)
+	(-hasChanged): restored accessors.
+	(-defaultAction): when "hasChanged" is YES, we request a reload of
+	the parent window. This feature was carelessly removed recently.
+
 2010-03-25  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxContactsUserFolders.js

UI/PreferencesUI/UIxPreferences.h

@@ -44,6 +44,7 @@
   NSArray *daysOfWeek, *daysBetweenResponsesList;
   NSArray *sieveFilters;
   NSMutableDictionary *vacationOptions, *forwardOptions;
+  BOOL hasChanged;
 }
 
 - (NSString *) userLongDateFormat;

UI/PreferencesUI/UIxPreferences.m

@@ -103,6 +103,8 @@
 	  if (!forwardOptions)
             forwardOptions = [NSMutableDictionary new];
 	}
+
+      hasChanged = NO;
     }
 
   return self;
@@ -126,6 +128,16 @@
   [super dealloc];
 }
 
+- (void) setHasChanged: (BOOL) newHasChanged
+{
+  hasChanged = newHasChanged;
+}
+
+- (BOOL) hasChanged
+{
+  return hasChanged;
+}
+
 - (void) setItem: (NSString *) newItem
 {
   ASSIGN (item, newItem);
@@ -913,6 +925,7 @@
   id <WOActionResults> results;
   WORequest *request;
   SOGoDomainDefaults *dd;
+  NSString *method;
 
   request = [context request];
   if ([[request method] isEqualToString: @"POST"])
@@ -939,7 +952,12 @@
                            acquire: NO];
       [account updateFilters];
 
-      results = [self jsCloseWithRefreshMethod: nil];
+      if (hasChanged)
+        method = @"window.location.reload()";
+      else
+        method = nil;
+
+      results = [self jsCloseWithRefreshMethod: method];
     }
   else
     results = self;

UI/Templates/PreferencesUI/UIxPreferences.wox

@@ -297,6 +297,8 @@
 	><div id="additionalView" class="tab">
 	  <var:component className="UIxAdditionalPreferences"/>
 	</div></var:if>
+      <input type="hidden" id="hasChanged" name="hasChanged"
+        var:value="hasChanged"/>
     </div>
   </form>
 </var:component>

UI/WebServerResources/UIxPreferences.js

@@ -76,6 +76,20 @@ 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);
 
@@ -84,6 +98,13 @@ 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();