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

Monotone-Parent: e63ebbcc6deba63bb09fed682c0c64d7967a0579 

Monotone-Revision: 550399a545ec39b76756d03253cfce780c28915b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-06T15:41:08
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-04-06 15:41:08 +00:00
parent 165425fd99
commit 0e3eac203d
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2010-04-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/UIxPreferences.js (prototypeIfyFilters):
we don't attempt to duplicate the rules if they don't exist.
(copyFilter): same as above.
* UI/WebServerResources/UIxFilterEditor.js (setupFilterViews): we
execute the callback for the match type SELECT in order to show or
hide the rules area depending on its initial value.
(onRuleAddClick): when the rules array does not exist, we must
create it.
2010-04-05 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/WebServerResources/SOGoRootPage.js

6
UI/WebServerResources/UIxFilterEditor.js
View File

@ -46,7 +46,7 @@ function loadMailboxes() {
function onLoadMailboxesCallback(http) {
if (http.readyState == 4) {
window.opener.userMailboxes = $([]);
log("http.status: " + http.status);
// log("http.status: " + http.status);
if (http.status == 200) {
checkAjaxRequestsState();
if (http.responseText.length > 0) {
@ -217,6 +217,8 @@ function setupFilterViews() {
}
}
}
onMatchTypeChange.apply(matchTypeSelect);
var filterActions = $("filterActions");
if (filterActions && filter.actions) {
for (var i = 0; i < filter.actions.length; i++) {
@ -726,6 +728,8 @@ function onRuleAddClick(event) {
var filterRules = $("filterRules");
if (filterRules) {
var newRule = createFilterRule();
if (!filter.rules)
filter.rules = [];
filter.rules.push(newRule);
var newRuleDiv = appendRule(filterRules, newRule);
setSelectedRuleDiv(newRuleDiv);

16
UI/WebServerResources/UIxPreferences.js
View File

@ -60,9 +60,11 @@ function prototypeIfyFilters() {
newFilter.match = filter.match;
newFilter.active = filter.active;
newFilter.rules = $([]);
for (var j = 0; j < filter.rules.length; j++) {
newFilter.rules.push($(filter.rules[j]));
if (filter.rules) {
newFilter.rules = $([]);
for (var j = 0; j < filter.rules.length; j++) {
newFilter.rules.push($(filter.rules[j]));
}
}
newFilter.actions = $([]);
@ -314,9 +316,11 @@ function copyFilter(originalFilter) {
newFilter.name = originalFilter.name;
newFilter.match = originalFilter.match;
newFilter.active = originalFilter.active;
newFilter.rules = [];
for (var i = 0; i < originalFilter.rules.length; i++) {
newFilter.rules.push(_copyFilterElement(originalFilter.rules[i]));
if (originalFilter.rules) {
newFilter.rules = [];
for (var i = 0; i < originalFilter.rules.length; i++) {
newFilter.rules.push(_copyFilterElement(originalFilter.rules[i]));
}
}
newFilter.actions = [];
for (var i = 0; i < originalFilter.actions.length; i++) {