[ACA-1923] Extensions - sort children by order (#850)

* sort children by order

* update cspell
This commit is contained in:
Cilibiu Bogdan 2018-12-04 18:32:49 +02:00 committed by Denys Vuika
parent 3ba4460754
commit e020dc4b77
2 changed files with 5 additions and 1 deletions

View File

@ -56,7 +56,8 @@
"keycodes", "keycodes",
"denysvuika", "denysvuika",
"submenu", "submenu",
"submenus" "submenus",
"simpletask"
], ],
"dictionaries": ["html", "en-gb", "en_US"] "dictionaries": ["html", "en-gb", "en_US"]
} }

View File

@ -360,6 +360,7 @@ export class AppExtensionService implements RuleContext {
disabled disabled
}; };
}) })
.sort(sortByOrder)
.reduce(reduceEmptyMenus, []) .reduce(reduceEmptyMenus, [])
.reduce(reduceSeparators, []); .reduce(reduceSeparators, []);
} }
@ -377,6 +378,7 @@ export class AppExtensionService implements RuleContext {
if (copy.children && copy.children.length > 0) { if (copy.children && copy.children.length > 0) {
copy.children = copy.children copy.children = copy.children
.filter(childAction => this.filterByRules(childAction)) .filter(childAction => this.filterByRules(childAction))
.sort(sortByOrder)
.reduce(reduceSeparators, []); .reduce(reduceSeparators, []);
} }
return copy; return copy;
@ -413,6 +415,7 @@ export class AppExtensionService implements RuleContext {
copy.children = copy.children copy.children = copy.children
.filter(entry => !entry.disabled) .filter(entry => !entry.disabled)
.filter(childAction => this.filterByRules(childAction)) .filter(childAction => this.filterByRules(childAction))
.sort(sortByOrder)
.reduce(reduceSeparators, []); .reduce(reduceSeparators, []);
} }
return copy; return copy;