mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-11-10 09:02:45 +08:00
Fix duplicate messages in the Drafts folder.
This commit is contained in:
RainLoop Team
parent
abc821c461
commit
be150d7fc9
5 changed files with 16 additions and 50 deletions
|
|
@ -324,7 +324,6 @@ WebMailAjaxRemoteStorage.prototype.messageSetSeenToAll = function (fCallback, sF
|
|||
* @param {?Function} fCallback
|
||||
* @param {string} sMessageFolder
|
||||
* @param {string} sMessageUid
|
||||
* @param {string} sMessageID
|
||||
* @param {string} sDraftFolder
|
||||
* @param {string} sFrom
|
||||
* @param {string} sTo
|
||||
|
|
@ -338,13 +337,12 @@ WebMailAjaxRemoteStorage.prototype.messageSetSeenToAll = function (fCallback, sF
|
|||
* @param {string} sInReplyTo
|
||||
* @param {string} sReferences
|
||||
*/
|
||||
WebMailAjaxRemoteStorage.prototype.saveMessage = function (fCallback, sMessageFolder, sMessageUid, sMessageID, sDraftFolder,
|
||||
WebMailAjaxRemoteStorage.prototype.saveMessage = function (fCallback, sMessageFolder, sMessageUid, sDraftFolder,
|
||||
sFrom, sTo, sCc, sBcc, sSubject, bTextIsHtml, sText, aAttachments, aDraftInfo, sInReplyTo, sReferences)
|
||||
{
|
||||
this.defaultRequest(fCallback, 'SaveMessage', {
|
||||
'MessageFolder': sMessageFolder,
|
||||
'MessageUid': sMessageUid,
|
||||
'MessageID': sMessageID,
|
||||
'DraftFolder': sDraftFolder,
|
||||
'From': sFrom,
|
||||
'To': sTo,
|
||||
|
|
@ -364,7 +362,6 @@ WebMailAjaxRemoteStorage.prototype.saveMessage = function (fCallback, sMessageFo
|
|||
* @param {?Function} fCallback
|
||||
* @param {string} sMessageFolder
|
||||
* @param {string} sMessageUid
|
||||
* @param {string} sMessageID
|
||||
* @param {string} sSentFolder
|
||||
* @param {string} sFrom
|
||||
* @param {string} sTo
|
||||
|
|
@ -378,13 +375,12 @@ WebMailAjaxRemoteStorage.prototype.saveMessage = function (fCallback, sMessageFo
|
|||
* @param {string} sInReplyTo
|
||||
* @param {string} sReferences
|
||||
*/
|
||||
WebMailAjaxRemoteStorage.prototype.sendMessage = function (fCallback, sMessageFolder, sMessageUid, sMessageID, sSentFolder,
|
||||
WebMailAjaxRemoteStorage.prototype.sendMessage = function (fCallback, sMessageFolder, sMessageUid, sSentFolder,
|
||||
sFrom, sTo, sCc, sBcc, sSubject, bTextIsHtml, sText, aAttachments, aDraftInfo, sInReplyTo, sReferences)
|
||||
{
|
||||
this.defaultRequest(fCallback, 'SendMessage', {
|
||||
'MessageFolder': sMessageFolder,
|
||||
'MessageUid': sMessageUid,
|
||||
'MessageID': sMessageID,
|
||||
'SentFolder': sSentFolder,
|
||||
'From': sFrom,
|
||||
'To': sTo,
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ function PopupsComposeViewModel()
|
|||
|
||||
this.draftFolder = ko.observable('');
|
||||
this.draftUid = ko.observable('');
|
||||
this.draftID = ko.observable('');
|
||||
this.sending = ko.observable(false);
|
||||
this.saving = ko.observable(false);
|
||||
this.attachments = ko.observableArray([]);
|
||||
|
|
@ -74,7 +73,7 @@ function PopupsComposeViewModel()
|
|||
}, this);
|
||||
|
||||
this.isDraftFolderMessage = ko.computed(function () {
|
||||
return '' !== this.draftFolder() && '' !== this.draftUid() && '' !== this.draftID();
|
||||
return '' !== this.draftFolder() && '' !== this.draftUid();
|
||||
}, this);
|
||||
|
||||
this.composeUploaderButton = ko.observable(null);
|
||||
|
|
@ -274,7 +273,6 @@ function PopupsComposeViewModel()
|
|||
this.sendMessageResponse,
|
||||
this.draftFolder(),
|
||||
this.draftUid(),
|
||||
this.draftID(),
|
||||
sSentFolder,
|
||||
this.currentIdentityResultEmail(),
|
||||
sTo,
|
||||
|
|
@ -310,7 +308,6 @@ function PopupsComposeViewModel()
|
|||
this.saveMessageResponse,
|
||||
this.draftFolder(),
|
||||
this.draftUid(),
|
||||
this.draftID(),
|
||||
RL.data().draftFolder(),
|
||||
this.currentIdentityResultEmail(),
|
||||
this.to(),
|
||||
|
|
@ -528,7 +525,6 @@ PopupsComposeViewModel.prototype.saveMessageResponse = function (sResult, oData)
|
|||
|
||||
this.draftFolder(oData.Result.NewFolder);
|
||||
this.draftUid(oData.Result.NewUid);
|
||||
this.draftID(oData.Result.NewID);
|
||||
|
||||
if (this.modalVisibility())
|
||||
{
|
||||
|
|
@ -688,7 +684,6 @@ PopupsComposeViewModel.prototype.onShow = function (sType, oMessageOrArray, aToE
|
|||
|
||||
this.draftFolder(oMessage.folderFullNameRaw);
|
||||
this.draftUid(oMessage.uid);
|
||||
this.draftID(oMessage.messageId());
|
||||
|
||||
this.subject(sSubject);
|
||||
this.prepearMessageAttachments(oMessage, sComposeType);
|
||||
|
|
@ -1350,7 +1345,6 @@ PopupsComposeViewModel.prototype.reset = function ()
|
|||
|
||||
this.draftFolder('');
|
||||
this.draftUid('');
|
||||
this.draftID('');
|
||||
|
||||
this.sending(false);
|
||||
this.saving(false);
|
||||
|
|
|
|||
|
|
@ -3527,11 +3527,10 @@ class Actions
|
|||
/**
|
||||
* @param \RainLoop\Account $oAccount
|
||||
* @param bool $bWithDraftInfo = true
|
||||
* @param string $sMessageID = ''
|
||||
*
|
||||
* @return \MailSo\Mime\Message
|
||||
*/
|
||||
private function buildMessage($oAccount, $bWithDraftInfo = true, $sMessageID = '')
|
||||
private function buildMessage($oAccount, $bWithDraftInfo = true)
|
||||
{
|
||||
$sFrom = $this->GetActionParam('From', '');
|
||||
$sTo = $this->GetActionParam('To', '');
|
||||
|
|
@ -3547,14 +3546,7 @@ class Actions
|
|||
$sReferences = $this->GetActionParam('References', '');
|
||||
|
||||
$oMessage = \MailSo\Mime\Message::NewInstance();
|
||||
if (empty($sMessageID))
|
||||
{
|
||||
$oMessage->RegenerateMessageId();
|
||||
}
|
||||
else
|
||||
{
|
||||
$oMessage->SetMessageId($sMessageID);
|
||||
}
|
||||
$oMessage->RegenerateMessageId();
|
||||
|
||||
$oMessage->SetXMailer('RainLoop/'.APP_VERSION);
|
||||
|
||||
|
|
@ -3696,7 +3688,6 @@ class Actions
|
|||
|
||||
$sMessageFolder = $this->GetActionParam('MessageFolder', '');
|
||||
$sMessageUid = $this->GetActionParam('MessageUid', '');
|
||||
$sMessageID = $this->GetActionParam('MessageID', '');
|
||||
|
||||
$sDraftFolder = $this->GetActionParam('DraftFolder', '');
|
||||
if (0 === strlen($sDraftFolder))
|
||||
|
|
@ -3704,7 +3695,7 @@ class Actions
|
|||
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::UnknownError);
|
||||
}
|
||||
|
||||
$oMessage = $this->buildMessage($oAccount, true, $sMessageID);
|
||||
$oMessage = $this->buildMessage($oAccount, true);
|
||||
|
||||
$this->Plugins()
|
||||
->RunHook('filter.save-message', array(&$oMessage))
|
||||
|
|
@ -3747,8 +3738,7 @@ class Actions
|
|||
{
|
||||
$mResult = array(
|
||||
'NewFolder' => $sDraftFolder,
|
||||
'NewUid' => $iNewUid,
|
||||
'NewID' => $sMessageId
|
||||
'NewUid' => $iNewUid
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -3766,11 +3756,10 @@ class Actions
|
|||
|
||||
$sDraftFolder = $this->GetActionParam('MessageFolder', '');
|
||||
$sDraftUid = $this->GetActionParam('MessageUid', '');
|
||||
$sMessageID = $this->GetActionParam('MessageID', '');
|
||||
$sSentFolder = $this->GetActionParam('SentFolder', '');
|
||||
$aDraftInfo = $this->GetActionParam('DraftInfo', null);
|
||||
|
||||
$oMessage = $this->buildMessage($oAccount, false, $sMessageID);
|
||||
$oMessage = $this->buildMessage($oAccount, false);
|
||||
|
||||
$this->Plugins()
|
||||
->RunHook('filter.send-message', array(&$oMessage))
|
||||
|
|
|
|||
|
|
@ -7896,7 +7896,6 @@ function PopupsComposeViewModel()
|
|||
|
||||
this.draftFolder = ko.observable('');
|
||||
this.draftUid = ko.observable('');
|
||||
this.draftID = ko.observable('');
|
||||
this.sending = ko.observable(false);
|
||||
this.saving = ko.observable(false);
|
||||
this.attachments = ko.observableArray([]);
|
||||
|
|
@ -7918,7 +7917,7 @@ function PopupsComposeViewModel()
|
|||
}, this);
|
||||
|
||||
this.isDraftFolderMessage = ko.computed(function () {
|
||||
return '' !== this.draftFolder() && '' !== this.draftUid() && '' !== this.draftID();
|
||||
return '' !== this.draftFolder() && '' !== this.draftUid();
|
||||
}, this);
|
||||
|
||||
this.composeUploaderButton = ko.observable(null);
|
||||
|
|
@ -8118,7 +8117,6 @@ function PopupsComposeViewModel()
|
|||
this.sendMessageResponse,
|
||||
this.draftFolder(),
|
||||
this.draftUid(),
|
||||
this.draftID(),
|
||||
sSentFolder,
|
||||
this.currentIdentityResultEmail(),
|
||||
sTo,
|
||||
|
|
@ -8154,7 +8152,6 @@ function PopupsComposeViewModel()
|
|||
this.saveMessageResponse,
|
||||
this.draftFolder(),
|
||||
this.draftUid(),
|
||||
this.draftID(),
|
||||
RL.data().draftFolder(),
|
||||
this.currentIdentityResultEmail(),
|
||||
this.to(),
|
||||
|
|
@ -8372,7 +8369,6 @@ PopupsComposeViewModel.prototype.saveMessageResponse = function (sResult, oData)
|
|||
|
||||
this.draftFolder(oData.Result.NewFolder);
|
||||
this.draftUid(oData.Result.NewUid);
|
||||
this.draftID(oData.Result.NewID);
|
||||
|
||||
if (this.modalVisibility())
|
||||
{
|
||||
|
|
@ -8532,7 +8528,6 @@ PopupsComposeViewModel.prototype.onShow = function (sType, oMessageOrArray, aToE
|
|||
|
||||
this.draftFolder(oMessage.folderFullNameRaw);
|
||||
this.draftUid(oMessage.uid);
|
||||
this.draftID(oMessage.messageId());
|
||||
|
||||
this.subject(sSubject);
|
||||
this.prepearMessageAttachments(oMessage, sComposeType);
|
||||
|
|
@ -9194,7 +9189,6 @@ PopupsComposeViewModel.prototype.reset = function ()
|
|||
|
||||
this.draftFolder('');
|
||||
this.draftUid('');
|
||||
this.draftID('');
|
||||
|
||||
this.sending(false);
|
||||
this.saving(false);
|
||||
|
|
@ -14309,7 +14303,6 @@ WebMailAjaxRemoteStorage.prototype.messageSetSeenToAll = function (fCallback, sF
|
|||
* @param {?Function} fCallback
|
||||
* @param {string} sMessageFolder
|
||||
* @param {string} sMessageUid
|
||||
* @param {string} sMessageID
|
||||
* @param {string} sDraftFolder
|
||||
* @param {string} sFrom
|
||||
* @param {string} sTo
|
||||
|
|
@ -14323,13 +14316,12 @@ WebMailAjaxRemoteStorage.prototype.messageSetSeenToAll = function (fCallback, sF
|
|||
* @param {string} sInReplyTo
|
||||
* @param {string} sReferences
|
||||
*/
|
||||
WebMailAjaxRemoteStorage.prototype.saveMessage = function (fCallback, sMessageFolder, sMessageUid, sMessageID, sDraftFolder,
|
||||
WebMailAjaxRemoteStorage.prototype.saveMessage = function (fCallback, sMessageFolder, sMessageUid, sDraftFolder,
|
||||
sFrom, sTo, sCc, sBcc, sSubject, bTextIsHtml, sText, aAttachments, aDraftInfo, sInReplyTo, sReferences)
|
||||
{
|
||||
this.defaultRequest(fCallback, 'SaveMessage', {
|
||||
'MessageFolder': sMessageFolder,
|
||||
'MessageUid': sMessageUid,
|
||||
'MessageID': sMessageID,
|
||||
'DraftFolder': sDraftFolder,
|
||||
'From': sFrom,
|
||||
'To': sTo,
|
||||
|
|
@ -14349,7 +14341,6 @@ WebMailAjaxRemoteStorage.prototype.saveMessage = function (fCallback, sMessageFo
|
|||
* @param {?Function} fCallback
|
||||
* @param {string} sMessageFolder
|
||||
* @param {string} sMessageUid
|
||||
* @param {string} sMessageID
|
||||
* @param {string} sSentFolder
|
||||
* @param {string} sFrom
|
||||
* @param {string} sTo
|
||||
|
|
@ -14363,13 +14354,12 @@ WebMailAjaxRemoteStorage.prototype.saveMessage = function (fCallback, sMessageFo
|
|||
* @param {string} sInReplyTo
|
||||
* @param {string} sReferences
|
||||
*/
|
||||
WebMailAjaxRemoteStorage.prototype.sendMessage = function (fCallback, sMessageFolder, sMessageUid, sMessageID, sSentFolder,
|
||||
WebMailAjaxRemoteStorage.prototype.sendMessage = function (fCallback, sMessageFolder, sMessageUid, sSentFolder,
|
||||
sFrom, sTo, sCc, sBcc, sSubject, bTextIsHtml, sText, aAttachments, aDraftInfo, sInReplyTo, sReferences)
|
||||
{
|
||||
this.defaultRequest(fCallback, 'SendMessage', {
|
||||
'MessageFolder': sMessageFolder,
|
||||
'MessageUid': sMessageUid,
|
||||
'MessageID': sMessageID,
|
||||
'SentFolder': sSentFolder,
|
||||
'From': sFrom,
|
||||
'To': sTo,
|
||||
|
|
@ -15669,9 +15659,6 @@ function RainLoopApp()
|
|||
this.oRemote = null;
|
||||
this.oCache = null;
|
||||
|
||||
this.iSuggestionsLimit = Utils.pInt(this.settingsGet('SuggestionsLimit'));
|
||||
this.iSuggestionsLimit = 0 === this.iSuggestionsLimit ? 20 : this.iSuggestionsLimit;
|
||||
|
||||
this.quotaDebounce = _.debounce(this.quota, 1000 * 30);
|
||||
|
||||
$.wakeUp(function () {
|
||||
|
|
|
|||
10
rainloop/v/0.0.0/static/js/app.min.js
vendored
10
rainloop/v/0.0.0/static/js/app.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue