LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog. 

Monotone-Parent: da4e71f9c5deca84b2df4c90effe9c90f66eb04c
Monotone-Revision: 73233c6953684efced8bd6fdd647e6c7f35931ee

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-02T19:42:46
maint-2.0.2
Francis Lachapelle 2012-01-02 19:42:46 +00:00
parent 45e13c3e4d
commit 7ec702d4ce
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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.

2
UI/WebServerResources/UIxFilterEditor.js
View File

@ -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) {

6
UI/WebServerResources/UIxPreferences.js
View File

@ -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) {

3
UI/WebServerResources/iefixes.css
View File

@ -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