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

See ChangeLog.

Browse source 
Monotone-Parent: 2dbc97722788e379c2eff9b155881604caafcc5a
Monotone-Revision: 3e744adf6d88b705bf6f061fa57f78c957b69bfe

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-14T18:46:52
This commit is contained in:
Francis Lachapelle 2012-01-14 18:46:52 +00:00
parent 007cd578ec
commit 76bd954d39
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
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-13 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m

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);