From 44db1826d59f424802263e0f00aec2103270adeb Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Thu, 11 Apr 2019 00:05:42 +0200 Subject: [PATCH] Refactor getChildrenDim --- src/utils/Sorter.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js index 99af3d98f..cf0e8a873 100644 --- a/src/utils/Sorter.js +++ b/src/utils/Sorter.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -import { isString, isFunction, isArray, result, indexOf } from 'underscore'; +import { isString, isFunction, isArray, result, each } from 'underscore'; import { on, off, @@ -811,28 +811,25 @@ module.exports = Backbone.View.extend({ * @retun {Array} * */ getChildrenDim(trg) { - var dims = []; + const dims = []; if (!trg) return dims; // Get children based on getChildrenContainer - var trgModel = this.getTargetModel(trg); + const trgModel = this.getTargetModel(trg); if (trgModel && trgModel.view && !this.ignoreViewChildren) { trg = trgModel.view.getChildrenContainer(); } - var ch = trg.children; - - for (var i = 0, len = ch.length; i < len; i++) { - var el = ch[i]; + each(trg.children, (el, i) => { const model = getModel(el, $); - const elIndex = model ? model.index() : i; + const elIndex = model && model.index ? model.index() : i; if (!isTextNode(el) && !this.matches(el, this.itemSel)) { - continue; + return; } - var dim = this.getDim(el); - var dir = this.direction; + const dim = this.getDim(el); + let dir = this.direction; if (dir == 'v') dir = true; else if (dir == 'h') dir = false; @@ -840,7 +837,7 @@ module.exports = Backbone.View.extend({ dim.push(dir, el, elIndex); dims.push(dim); - } + }); return dims; },