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

Sieve Filters (Interface first look)

Browse source 
Code refactoring
Small fixes
This commit is contained in:
RainLoop Team 2014-08-07 01:02:20 +04:00
parent 409e9fbdc2
commit 1027f319ed
43 changed files with 466 additions and 427 deletions
Download patch file Download diff file Expand all files Collapse all files

50
dev/Models/FilterActionModel.js
View file

@ -1,50 +0,0 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
/**
* @constructor
*/
function FilterActionModel(oKoList, oKoCanBeDeleted)
{
this.parentList = oKoList;
this.canBeDeleted = oKoCanBeDeleted;
this.value = ko.observable('');
this.type = ko.observable(Enums.FiltersAction.Move);
this.typeOptions = [ // TODO i18n
{'id': Enums.FiltersAction.Move, 'name': 'Move to'},
{'id': Enums.FiltersAction.Forward, 'name': 'Forward to'},
{'id': Enums.FiltersAction.Delete, 'name': 'Discard'},
{'id': Enums.FiltersAction.MarkAsRead, 'name': 'Mark as read'}
];
this.template = ko.computed(function () {
var sTemplate = '';
switch (this.type())
{
default:
case Enums.FiltersAction.Move:
sTemplate = 'SettingsFiltersActionValueAsFolders';
break;
case Enums.FiltersAction.Forward:
sTemplate = 'SettingsFiltersActionWithValue';
break;
case Enums.FiltersAction.MarkAsRead:
case Enums.FiltersAction.Delete:
sTemplate = 'SettingsFiltersActionNoValue';
break;
}
return sTemplate;
}, this);
}
FilterActionModel.prototype.removeSelf = function ()
{
if (this.canBeDeleted())
{
this.parentList.remove(this);
}
};

26
dev/Models/FilterConditionModel.js
View file

@ -3,25 +3,26 @@
/**
* @constructor
*/
function FilterConditionModel(oKoList, oKoCanBeDeleted)
function FilterConditionModel(oKoList)
{
this.parentList = oKoList;
this.canBeDeleted = oKoCanBeDeleted;
this.field = ko.observable(Enums.FilterConditionField.Subject);
this.field = ko.observable(Enums.FilterConditionField.From);
this.fieldOptions = [ // TODO i18n
{'id': Enums.FilterConditionField.Subject, 'name': 'Subject'},
{'id': Enums.FilterConditionField.Recipient, 'name': 'Recipient (To or CC)'},
{'id': Enums.FilterConditionField.From, 'name': 'From'},
{'id': Enums.FilterConditionField.To, 'name': 'To'}
{'id': Enums.FilterConditionField.Recipient, 'name': 'Recipient (To or CC)'},
{'id': Enums.FilterConditionField.To, 'name': 'To'},
{'id': Enums.FilterConditionField.Subject, 'name': 'Subject'}
];
this.type = ko.observable(Enums.FilterConditionType.Contains);
this.type = ko.observable(Enums.FilterConditionType.EqualTo);
this.typeOptions = [ // TODO i18n
{'id': Enums.FilterConditionType.Contains, 'name': 'Contains'},
{'id': Enums.FilterConditionType.NotContains, 'name': 'Not Contains'},
{'id': Enums.FilterConditionType.EqualTo, 'name': 'Equal To'},
{'id': Enums.FilterConditionType.NotEqualTo, 'name': 'Not Equal To'}
{'id': Enums.FilterConditionType.NotEqualTo, 'name': 'Not Equal To'},
{'id': Enums.FilterConditionType.Contains, 'name': 'Contains'},
{'id': Enums.FilterConditionType.NotContains, 'name': 'Not Contains'}
];
this.value = ko.observable('');
@ -43,8 +44,5 @@ function FilterConditionModel(oKoList, oKoCanBeDeleted)
FilterConditionModel.prototype.removeSelf = function ()
{
if (this.canBeDeleted())
{
this.parentList.remove(this);
}
this.parentList.remove(this);
};

52
dev/Models/FilterModel.js
View file

@ -5,6 +5,7 @@
*/
function FilterModel()
{
this.new = ko.observable(true);
this.enabled = ko.observable(true);
this.name = ko.observable('');
@ -12,33 +13,56 @@ function FilterModel()
this.conditionsType = ko.observable(Enums.FilterRulesType.And);
this.conditions = ko.observableArray([]);
this.actions = ko.observableArray([]);
this.conditions.subscribe(function () {
Utils.windowResize();
});
this.actions.subscribe(function () {
Utils.windowResize();
});
// Actions
this.actionMarkAsRead = ko.observable(false);
this.actionSkipOtherFilters = ko.observable(true);
this.actionValue = ko.observable('');
this.conditionsCanBeDeleted = ko.computed(function () {
return 1 < this.conditions().length;
this.actionType = ko.observable(Enums.FiltersAction.Move);
this.actionTypeOptions = [ // TODO i18n
{'id': Enums.FiltersAction.None, 'name': 'Action - None'},
{'id': Enums.FiltersAction.Move, 'name': 'Action - Move to'},
// {'id': Enums.FiltersAction.Forward, 'name': 'Action - Forward to'},
{'id': Enums.FiltersAction.Discard, 'name': 'Action - Discard'}
];
this.actionMarkAsReadVisiblity = ko.computed(function () {
return -1 < Utils.inArray(this.actionType(), [
Enums.FiltersAction.None, Enums.FiltersAction.Forward, Enums.FiltersAction.Move
]);
}, this);
this.actionsCanBeDeleted = ko.computed(function () {
return 1 < this.actions().length;
this.actionTemplate = ko.computed(function () {
var sTemplate = '';
switch (this.actionType())
{
default:
case Enums.FiltersAction.Move:
sTemplate = 'SettingsFiltersActionValueAsFolders';
break;
case Enums.FiltersAction.Forward:
sTemplate = 'SettingsFiltersActionWithValue';
break;
case Enums.FiltersAction.None:
case Enums.FiltersAction.Discard:
sTemplate = 'SettingsFiltersActionNoValue';
break;
}
return sTemplate;
}, this);
}
FilterModel.prototype.addCondition = function ()
{
this.conditions.push(new FilterConditionModel(this.conditions, this.conditionsCanBeDeleted));
};
FilterModel.prototype.addAction = function ()
{
this.actions.push(new FilterActionModel(this.actions, this.actionsCanBeDeleted));
this.conditions.push(new FilterConditionModel(this.conditions));
};
FilterModel.prototype.parse = function (oItem)