Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pre release fixes and improvements

Browse source
This commit is contained in:
RainLoop Team 2015-02-01 19:44:44 +04:00
parent 67c5e31e58
commit abddb3d828
61 changed files with 378 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dev/Model/Filter.js
View file

@ -41,12 +41,12 @@
this.actionValue.error = ko.observable(false);
this.actionValueSecond = ko.observable('');
this.actionValueThird = ko.observable('');
this.actionMarkAsRead = ko.observable(false);
this.actionSkipOthers = ko.observable(false);
this.actionKeep = ko.observable(true);
this.actionNoStop = ko.observable(false);
this.actionType = ko.observable(Enums.FiltersAction.MoveTo);
@ -54,6 +54,7 @@
this.actionValue('');
this.actionValue.error(false);
this.actionValueSecond('');
this.actionValueThird('');
}, this);
var fGetRealFolderName = function (sFolderFullNameRaw) {
@ -136,7 +137,7 @@
this.actionValue.error('' === sValue);
}, this));
this.regDisposables([this.actionTemplate]);
this.regDisposables([this.actionNoStop, this.actionTemplate]);
this.deleteAccess = ko.observable(false);
this.canBeDalete = ko.observable(true);
@ -207,11 +208,12 @@
'ActionValue': this.actionValue(),
'ActionValueSecond': this.actionValueSecond(),
'ActionValueThird': this.actionValueThird(),
'ActionType': this.actionType(),
'Stop': this.actionNoStop() ? '0' : '1',
'Keep': this.actionKeep() ? '1' : '0',
'MarkAsRead': this.actionMarkAsRead() ? '1' : '0',
'SkipOthers': this.actionSkipOthers() ? '1' : '0'
'MarkAsRead': this.actionMarkAsRead() ? '1' : '0'
};
};
@ -252,10 +254,11 @@
this.actionValue(Utils.pString(oItem['ActionValue']));
this.actionValueSecond(Utils.pString(oItem['ActionValueSecond']));
this.actionValueThird(Utils.pString(oItem['ActionValueThird']));
this.actionNoStop(!oItem['Stop']);
this.actionKeep(!!oItem['Keep']);
this.actionMarkAsRead(!!oItem['MarkAsRead']);
this.actionSkipOthers(!!oItem['SkipOthers']);
bResult = true;
}
@ -277,7 +280,6 @@
oClone.conditionsType(this.conditionsType());
oClone.actionMarkAsRead(this.actionMarkAsRead());
oClone.actionSkipOthers(this.actionSkipOthers());
oClone.actionType(this.actionType());
@ -285,8 +287,10 @@
oClone.actionValue.error(this.actionValue.error());
oClone.actionValueSecond(this.actionValueSecond());
oClone.actionValueThird(this.actionValueThird());
oClone.actionKeep(this.actionKeep());
oClone.actionNoStop(this.actionNoStop());
oClone.conditions(_.map(this.conditions(), function (oCondition) {
return oCondition.cloneSelf();