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

Merge branch 'master' into addressbook

Browse source
This commit is contained in:
djmaze 2022-07-22 11:16:32 +02:00
commit 513b2fcae8
12 changed files with 21 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/Sieve/Model/Filter.js
View file

@ -233,8 +233,8 @@ export class FilterModel extends AbstractModel {
return filter;
}
cloneSelf() {
const filter = new FilterModel();
assignTo(target) {
const filter = target || new FilterModel();
filter.id = this.id;

15
dev/Sieve/View/Script.js
View file

@ -102,24 +102,15 @@ export class SieveScriptPopupView extends rl.pluginPopupView {
filter.generateID();
FilterPopupView.showModal([
filter,
() => this.filters.push(filter)
() => this.filters.push(filter.assignTo())
]);
}
editFilter(filter) {
const clonedFilter = filter.cloneSelf();
const clonedFilter = filter.assignTo();
FilterPopupView.showModal([
clonedFilter,
() => {
const script = this.script(),
filters = script.filters(),
index = filters.indexOf(filter);
if (-1 < index) {
// script.filters.splice(index, 1, clonedFilter);
filters[index] = clonedFilter;
script.filters(filters);
}
},
() => clonedFilter.assignTo(filter),
true
]);
}