merge of '708b215bd02d30547b93140994babe45b2472573'

and '7c54925b7d17d30cc75f406592cb3e9c01a59759'

Monotone-Parent: 708b215bd02d30547b93140994babe45b2472573
Monotone-Parent: 7c54925b7d17d30cc75f406592cb3e9c01a59759
Monotone-Revision: 57e41fda15f1e4891e7b367169b5662b73274f50

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-03-01T21:22:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-03-01 21:22:11 +00:00
2 changed files with 8 additions and 2 deletions

View File

@@ -3,6 +3,12 @@
* SoObjects/SOGo/SOGoDomainDefaults.m (-imapFolderSeparator): new
method.
2010-03-01 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxMailEditor.js (-clickedEditorSend):
fixed wrong condition that would result in refusing to send a
message after having clicked on the Save button.
2010-02-23 Ludovic Marcotte <lmarcotte@inverse.ca>
* Added a patch from Adam Yearout <ayearout@royal.wednet.edu>

View File

@@ -125,8 +125,8 @@ function validateEditorInput(sender) {
return true;
}
function clickedEditorSend(sender) { log (document.pageform.action);
if (document.pageform.action || !validateEditorInput(sender))
function clickedEditorSend(sender) {
if (document.pageform.action == "send" || !validateEditorInput(sender))
return false;
var input = currentAttachmentInput();