Browse Source

Refactor getChildrenDim

pull/2031/head
Artur Arseniev 7 years ago
parent
commit
44db1826d5
  1. 21
      src/utils/Sorter.js

21
src/utils/Sorter.js

@ -1,5 +1,5 @@
import Backbone from 'backbone'; import Backbone from 'backbone';
import { isString, isFunction, isArray, result, indexOf } from 'underscore'; import { isString, isFunction, isArray, result, each } from 'underscore';
import { import {
on, on,
off, off,
@ -811,28 +811,25 @@ module.exports = Backbone.View.extend({
* @retun {Array} * @retun {Array}
* */ * */
getChildrenDim(trg) { getChildrenDim(trg) {
var dims = []; const dims = [];
if (!trg) return dims; if (!trg) return dims;
// Get children based on getChildrenContainer // Get children based on getChildrenContainer
var trgModel = this.getTargetModel(trg); const trgModel = this.getTargetModel(trg);
if (trgModel && trgModel.view && !this.ignoreViewChildren) { if (trgModel && trgModel.view && !this.ignoreViewChildren) {
trg = trgModel.view.getChildrenContainer(); trg = trgModel.view.getChildrenContainer();
} }
var ch = trg.children; each(trg.children, (el, i) => {
for (var i = 0, len = ch.length; i < len; i++) {
var el = ch[i];
const model = getModel(el, $); 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)) { if (!isTextNode(el) && !this.matches(el, this.itemSel)) {
continue; return;
} }
var dim = this.getDim(el); const dim = this.getDim(el);
var dir = this.direction; let dir = this.direction;
if (dir == 'v') dir = true; if (dir == 'v') dir = true;
else if (dir == 'h') dir = false; else if (dir == 'h') dir = false;
@ -840,7 +837,7 @@ module.exports = Backbone.View.extend({
dim.push(dir, el, elIndex); dim.push(dir, el, elIndex);
dims.push(dim); dims.push(dim);
} });
return dims; return dims;
}, },

Loading…
Cancel
Save