From a6e811f65117d5b5a64604a52e7559cdfad53792 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Fri, 8 Dec 2017 12:03:19 +0100 Subject: [PATCH] Refactor ComponentTableBody --- src/dom_components/model/ComponentTable.js | 12 +----- .../model/ComponentTableBody.js | 40 +++++++++---------- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/src/dom_components/model/ComponentTable.js b/src/dom_components/model/ComponentTable.js index 2e88632a2..6f784425d 100644 --- a/src/dom_components/model/ComponentTable.js +++ b/src/dom_components/model/ComponentTable.js @@ -14,16 +14,8 @@ module.exports = Component.extend({ !components.length && components.add({ type: 'tbody' }); }, -},{ - - /** - * Detect if the passed element is a valid component. - * In case the element is valid an object abstracted - * from the element will be returned - * @param {HTMLElement} - * @return {Object} - * @private - */ +}, { + isComponent(el) { let result = ''; diff --git a/src/dom_components/model/ComponentTableBody.js b/src/dom_components/model/ComponentTableBody.js index 1ed348326..943bdb33e 100644 --- a/src/dom_components/model/ComponentTableBody.js +++ b/src/dom_components/model/ComponentTableBody.js @@ -1,28 +1,29 @@ -var Component = require('./Component'); +const Component = require('./Component'); module.exports = Component.extend({ - defaults: _.extend({}, Component.prototype.defaults, { + defaults: { ...Component.prototype.defaults, type: 'tbody', tagName: 'tbody', + draggable: ['table'], droppable: ['tr'], columns: 1, rows: 1, - }), + }, initialize(o, opt) { Component.prototype.initialize.apply(this, arguments); - var components = this.get('components'); - var rows = this.get('rows'); - var columns = this.get('columns'); + const components = this.get('components'); + let columns = this.get('columns'); + let rows = this.get('rows'); // Init components if empty - if(!components.length){ - var rowsToAdd = []; + if (!components.length) { + const rowsToAdd = []; - while(rows--){ - var columnsToAdd = []; - var clm = columns; + while (rows--) { + const columnsToAdd = []; + let clm = columns; while (clm--) { columnsToAdd.push({ @@ -37,25 +38,20 @@ module.exports = Component.extend({ components: columnsToAdd }); } + components.add(rowsToAdd); } }, },{ - /** - * Detect if the passed element is a valid component. - * In case the element is valid an object abstracted - * from the element will be returned - * @param {HTMLElement} - * @return {Object} - * @private - */ isComponent(el) { - var result = ''; - if(el.tagName == 'TBODY'){ - result = {type: 'tbody'}; + let result = ''; + + if (el.tagName == 'TBODY') { + result = { type: 'tbody' }; } + return result; },