From 7ec702d4ce319bd2a5c5e1eff453b63b6c315bbf Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 2 Jan 2012 19:42:46 +0000
Subject: [PATCH] See ChangeLog.

Monotone-Parent: da4e71f9c5deca84b2df4c90effe9c90f66eb04c
Monotone-Revision: 73233c6953684efced8bd6fdd647e6c7f35931ee

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-02T19:42:46
---
 ChangeLog                                | 4 ++++
 UI/WebServerResources/UIxFilterEditor.js | 2 +-
 UI/WebServerResources/UIxPreferences.js  | 6 +++---
 UI/WebServerResources/iefixes.css        | 3 +++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7cce59274..caf41667d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-01-02  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/UIxPreferences.js (getFilterFromEditor):
+	return a string (JSON) so the data is properly passed to the
+	opened window with IE7.
+
 	* UI/WebServerResources/UIxFilterEditor.js (ensureFieldValidity):
 	a field value is always considered invalid when empty.
 
diff --git a/UI/WebServerResources/UIxFilterEditor.js b/UI/WebServerResources/UIxFilterEditor.js
index da4e4358e..3755c4a06 100644
--- a/UI/WebServerResources/UIxFilterEditor.js
+++ b/UI/WebServerResources/UIxFilterEditor.js
@@ -27,7 +27,7 @@ function onLoadHandler() {
     if (!window.opener || filterId == "new") {
         setupNewFilterData();
     } else {
-        filter = window.opener.getFilterFromEditor(filterId);
+        filter = window.opener.getFilterFromEditor(filterId).evalJSON();
     }
 
     if (!window.opener || window.opener.userMailboxes) {
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 1fb54bad4..f640d0244 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -193,7 +193,7 @@ function initPreferences() {
             $("replyPlacementList").selectedIndex = 0;
             $("replyPlacementList").disabled = 1;
         }
-        onReplyPlacementListChange ();
+        onReplyPlacementListChange();
     }
 
     var button = $("addDefaultEmailAddresses");
@@ -353,7 +353,6 @@ function onFilterEdit(event) {
 
 function copyFilter(originalFilter) {
     var newFilter = {};
-
     newFilter.name = originalFilter.name;
     newFilter.match = originalFilter.match;
     newFilter.active = originalFilter.active;
@@ -388,7 +387,8 @@ function getSieveCapabilitiesFromEditor() {
 }
 
 function getFilterFromEditor(filterId) {
-    return copyFilter(filters[filterId]);
+    var filter = copyFilter(filters[filterId]);
+    return Object.toJSON(filter);
 }
 
 function setupMailboxesFromJSON(jsonResponse) {
diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index f364c9952..428d01926 100644
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -81,6 +81,9 @@ TABLE.messageList TR.thread TD
 DIV#editorTabs TABLE.frame INPUT.textField
 { margin: 0px; }
 
+INPUT.textField._invalid, INPUT.comboBoxField._invalid
+{ background: #f00 !important; }
+
 /* UIxAppointmentEditor */
 
 DIV#attendeesMenu LI.separator