mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-29 20:19:22 +03:00
Merge Objects prototype extensions
This commit is contained in:
parent
0647b5201f
commit
f2d194947d
26 changed files with 108 additions and 127 deletions
|
|
@ -1,7 +1,7 @@
|
|||
import ko from 'ko';
|
||||
|
||||
import { FilterRulesType, FiltersAction } from 'Common/Enums';
|
||||
import { pString, isNonEmptyArray, fakeMd5, delegateRunOnDestroy } from 'Common/Utils';
|
||||
import { pString, fakeMd5, delegateRunOnDestroy } from 'Common/Utils';
|
||||
import { i18n } from 'Common/Translator';
|
||||
import { getFolderFromCacheList } from 'Common/Cache';
|
||||
|
||||
|
|
@ -225,7 +225,7 @@ class FilterModel extends AbstractModel {
|
|||
|
||||
this.conditions([]);
|
||||
|
||||
if (isNonEmptyArray(json.Conditions)) {
|
||||
if (Array.isNotEmpty(json.Conditions)) {
|
||||
this.conditions(
|
||||
json.Conditions.map(aData => {
|
||||
const filterCondition = new FilterConditionModel();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue