amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-25 23:09:29 +00:00
Code Issues Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_12' (head d7e3b62e2d085f5bc624b04dd91f11f866364b13)

Browse Source 
to branch 'ca.inverse.sogo' (head b9e528a27e01ed03f230f04af5fbb3e72756f192)

Monotone-Parent: b9e528a27e01ed03f230f04af5fbb3e72756f192
Monotone-Parent: d7e3b62e2d085f5bc624b04dd91f11f866364b13
Monotone-Revision: 64af02cee8887fd3481d476d2c1a32bae0209e18

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-17T19:53:38
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-01-17 19:53:38 +00:00
parent edf77158c8 8db30c1149
commit 7003b0d9a3
3 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
2012-01-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/UIxFilterEditor.js (setupNewFilterData):
mark new filter as active by default.
2012-01-17 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxPreferences.js (initPreferences): When
the mail composer is set to use HTML, the reply position popup
menu is disabled. When switching to text-based message,
the popup menu is now correctly re-enabled.
2012-01-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SQLSource.m (_lookupContactEntry:considerEmail:)

3
UI/WebServerResources/UIxFilterEditor.js
View File

@@ -182,7 +182,8 @@ function createFilterAction() {
function setupNewFilterData() {
var newFilterTemplate = $({ name: _("Untitled Filter"),
match: "any" });
match: "any",
active: true });
newFilterTemplate.rules = $([ createFilterRule() ]);
newFilterTemplate.actions = $([ createFilterAction() ]);

23
UI/WebServerResources/UIxPreferences.js
View File

@@ -109,10 +109,10 @@ function _setupEvents() {
// We check for non-null elements as replyPlacementList and composeMessagesType
// might not be present if ModulesConstraints disable those elements
if ($("replyPlacementList"))
$("replyPlacementList").observe ("change", onReplyPlacementListChange);
$("replyPlacementList").observe("change", onReplyPlacementListChange);
if ($("composeMessagesType"))
$("composeMessagesType").observe ("change", onComposeMessagesTypeChange);
$("composeMessagesType").observe("change", onComposeMessagesTypeChange);
// Note: we also monitor changes to the calendar categories.
// See functions endEditable and onColorPickerChoice.
@@ -188,15 +188,24 @@ function initPreferences() {
}
// Disable placement (after) if composing in HTML
if ($("composeMessagesType")) {
if ($("composeMessagesType").value == 1) {
$("replyPlacementList").selectedIndex = 0;
$("replyPlacementList").disabled = 1;
var button = $("composeMessagesType");
if (button) {
if (button.value == 1) {
$("replyPlacementList").value = 0;
$("replyPlacementList").disabled = true;
}
onReplyPlacementListChange();
button.on("change", function(event) {
if (this.value == 0)
$("replyPlacementList").disabled = false;
else {
$("replyPlacementList").value = 0;
$("replyPlacementList").disabled = true;
}
});
}
var button = $("addDefaultEmailAddresses");
button = $("addDefaultEmailAddresses");
if (button)
button.observe("click", addDefaultEmailAddresses);