diff --git a/package-lock.json b/package-lock.json index c98c5edbd..c1833e93e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3698,15 +3698,6 @@ "babel-runtime": "^6.22.0" } }, - "babel-plugin-add-module-exports": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-1.0.2.tgz", - "integrity": "sha512-4paN7RivvU3Rzju1vGSHWPjO8Y0rI6droWvSFKI6dvEQ4mvoV0zGojnlzVRfI6N8zISo6VERXt3coIuVmzuvNg==", - "dev": true, - "requires": { - "chokidar": "^2.0.4" - } - }, "babel-plugin-check-es2015-constants": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", diff --git a/package.json b/package.json index 33678e2c2..83cf46733 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "@babel/plugin-transform-runtime": "^7.4.4", "@babel/preset-env": "^7.4.5", "babel-loader": "^8.0.6", - "babel-plugin-add-module-exports": "^1.0.2", "documentation": "^8.1.2", "eslint": "^5.9.0", "html-webpack-plugin": "^3.2.0", @@ -73,8 +72,7 @@ ] ], "plugins": [ - "@babel/plugin-transform-runtime", - "add-module-exports" + "@babel/plugin-transform-runtime" ] }, "lint-staged": { diff --git a/src/asset_manager/index.js b/src/asset_manager/index.js index 85e754117..2ba2e8e46 100644 --- a/src/asset_manager/index.js +++ b/src/asset_manager/index.js @@ -30,12 +30,13 @@ * @module AssetManager */ +import defaults from './config/config'; +import Assets from './model/Assets'; +import AssetsView from './view/AssetsView'; +import FileUpload from './view/FileUploader'; + export default () => { let c = {}; - const defaults = require('./config/config'); - const Assets = require('./model/Assets'); - const AssetsView = require('./view/AssetsView'); - const FileUpload = require('./view/FileUploader'); let assets, am, fu; return { diff --git a/src/asset_manager/model/Asset.js b/src/asset_manager/model/Asset.js index 9a77c3730..79d456682 100644 --- a/src/asset_manager/model/Asset.js +++ b/src/asset_manager/model/Asset.js @@ -1,4 +1,6 @@ -export default require('backbone').Model.extend({ +import Backbone from 'backbone'; + +export default Backbone.Model.extend({ idAttribute: 'src', defaults: { diff --git a/src/asset_manager/model/AssetImage.js b/src/asset_manager/model/AssetImage.js index bc94e8b4b..096dbc708 100644 --- a/src/asset_manager/model/AssetImage.js +++ b/src/asset_manager/model/AssetImage.js @@ -1,4 +1,4 @@ -const Asset = require('./Asset'); +import Asset from './Asset'; export default Asset.extend({ defaults: { diff --git a/src/asset_manager/model/Assets.js b/src/asset_manager/model/Assets.js index d49d0b9f8..398cd9b6d 100644 --- a/src/asset_manager/model/Assets.js +++ b/src/asset_manager/model/Assets.js @@ -1,22 +1,23 @@ +import Backbone from 'backbone'; +import AssetImage from './AssetImage'; +import AssetImageView from './../view/AssetImageView'; import TypeableCollection from 'domain_abstract/model/TypeableCollection'; -export default require('backbone') - .Collection.extend(TypeableCollection) - .extend({ - types: [ - { - id: 'image', - model: require('./AssetImage'), - view: require('./../view/AssetImageView'), - isType(value) { - if (typeof value == 'string') { - return { - type: 'image', - src: value - }; - } - return value; +export default Backbone.Collection.extend(TypeableCollection).extend({ + types: [ + { + id: 'image', + model: AssetImage, + view: AssetImageView, + isType(value) { + if (typeof value == 'string') { + return { + type: 'image', + src: value + }; } + return value; } - ] - }); + } + ] +}); diff --git a/src/asset_manager/view/AssetImageView.js b/src/asset_manager/view/AssetImageView.js index 2c4e50ee5..2b2a71318 100644 --- a/src/asset_manager/view/AssetImageView.js +++ b/src/asset_manager/view/AssetImageView.js @@ -1,6 +1,7 @@ import { isFunction } from 'underscore'; +import AssetView from './AssetView'; -export default require('./AssetView').extend({ +export default AssetView.extend({ events: { 'click [data-toggle=asset-remove]': 'onRemove', click: 'onClick', diff --git a/src/asset_manager/view/AssetView.js b/src/asset_manager/view/AssetView.js index 202b35696..7c097be76 100644 --- a/src/asset_manager/view/AssetView.js +++ b/src/asset_manager/view/AssetView.js @@ -1,4 +1,5 @@ import Backbone from 'backbone'; +import { clone } from 'underscore'; export default Backbone.View.extend({ initialize(o = {}) { @@ -38,7 +39,7 @@ export default Backbone.View.extend({ * */ updateTarget(target) { if (target && target.set) { - target.set('attributes', _.clone(target.get('attributes'))); + target.set('attributes', clone(target.get('attributes'))); target.set('src', this.model.get('src')); } }, diff --git a/src/asset_manager/view/AssetsView.js b/src/asset_manager/view/AssetsView.js index 4d6901a0f..ae348642a 100644 --- a/src/asset_manager/view/AssetsView.js +++ b/src/asset_manager/view/AssetsView.js @@ -1,7 +1,4 @@ import Backbone from 'backbone'; -var AssetView = require('./AssetView'); -var AssetImageView = require('./AssetImageView'); -var FileUploader = require('./FileUploader'); export default Backbone.View.extend({ events: { diff --git a/src/asset_manager/view/FileUploader.js b/src/asset_manager/view/FileUploader.js index f4b50be8e..847ea1392 100644 --- a/src/asset_manager/view/FileUploader.js +++ b/src/asset_manager/view/FileUploader.js @@ -1,10 +1,10 @@ -import _ from 'underscore'; +import { template } from 'underscore'; import Backbone from 'backbone'; import fetch from 'utils/fetch'; export default Backbone.View.extend( { - template: _.template(` + template: template(`
<%= title %>
<%= multiUpload ? 'multiple' : '' %>/> diff --git a/src/block_manager/index.js b/src/block_manager/index.js index 7e8153fbc..4d757c45f 100644 --- a/src/block_manager/index.js +++ b/src/block_manager/index.js @@ -26,13 +26,13 @@ * @module BlockManager */ import { isElement } from 'underscore'; +import defaults from './config/config'; +import Blocks from './model/Blocks'; +import BlockCategories from './model/Categories'; +import BlocksView from './view/BlocksView'; export default () => { - var c = {}, - defaults = require('./config/config'), - Blocks = require('./model/Blocks'), - BlockCategories = require('./model/Categories'), - BlocksView = require('./view/BlocksView'); + var c = {}; var blocks, blocksVisible, blocksView; var categories = []; diff --git a/src/block_manager/model/Block.js b/src/block_manager/model/Block.js index b5d5dc5e1..1a5185d76 100644 --- a/src/block_manager/model/Block.js +++ b/src/block_manager/model/Block.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -var Category = require('./Category'); +import Category from './Category'; export default Backbone.Model.extend({ defaults: { diff --git a/src/block_manager/model/Blocks.js b/src/block_manager/model/Blocks.js index dcf0fd6fe..8af662b74 100644 --- a/src/block_manager/model/Blocks.js +++ b/src/block_manager/model/Blocks.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -var Block = require('./Block'); +import Block from './Block'; export default Backbone.Collection.extend({ model: Block diff --git a/src/block_manager/model/Categories.js b/src/block_manager/model/Categories.js index b30d48308..61f9f4e89 100644 --- a/src/block_manager/model/Categories.js +++ b/src/block_manager/model/Categories.js @@ -1,5 +1,6 @@ import Backbone from 'backbone'; +import Category from './Category'; export default Backbone.Collection.extend({ - model: require('./Category') + model: Category }); diff --git a/src/block_manager/view/BlocksView.js b/src/block_manager/view/BlocksView.js index 90c0fab56..853f5dea8 100644 --- a/src/block_manager/view/BlocksView.js +++ b/src/block_manager/view/BlocksView.js @@ -1,9 +1,9 @@ +import Backbone from 'backbone'; import { isString, isObject, bindAll } from 'underscore'; +import BlockView from './BlockView'; +import CategoryView from './CategoryView'; -const BlockView = require('./BlockView'); -const CategoryView = require('./CategoryView'); - -export default require('backbone').View.extend({ +export default Backbone.View.extend({ initialize(opts, config) { bindAll(this, 'getSorter', 'onDrag', 'onDrop'); this.config = config || {}; diff --git a/src/block_manager/view/CategoryView.js b/src/block_manager/view/CategoryView.js index 46f19a59f..f05acdf97 100644 --- a/src/block_manager/view/CategoryView.js +++ b/src/block_manager/view/CategoryView.js @@ -1,8 +1,8 @@ -import _ from 'underscore'; +import { template } from 'underscore'; import Backbone from 'backbone'; export default Backbone.View.extend({ - template: _.template(` + template: template(`
<%= label %> diff --git a/src/canvas/index.js b/src/canvas/index.js index e11c793ba..b065b5ef4 100644 --- a/src/canvas/index.js +++ b/src/canvas/index.js @@ -32,16 +32,17 @@ import { on, off, hasDnd, getElement, getPointerEvent } from 'utils/mixins'; import Droppable from 'utils/Droppable'; +import defaults from './config/config'; +import Canvas from './model/Canvas'; +import canvasView from './view/CanvasView'; const { requestAnimationFrame } = window; export default () => { - var c = {}, - defaults = require('./config/config'), - Canvas = require('./model/Canvas'), - CanvasView = require('./view/CanvasView'); - var canvas; - var frameRect; + let c = {}; + let canvas; + let frameRect; + let CanvasView; return { /** @@ -75,7 +76,7 @@ export default () => { if (ppfx) c.stylePrefix = ppfx + c.stylePrefix; canvas = new Canvas(config); - CanvasView = new CanvasView({ + CanvasView = new canvasView({ model: canvas, config: c }); diff --git a/src/canvas/model/Canvas.js b/src/canvas/model/Canvas.js index 6971c7877..af7d2eca1 100644 --- a/src/canvas/model/Canvas.js +++ b/src/canvas/model/Canvas.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -var Frame = require('./Frame'); +import Frame from './Frame'; export default Backbone.Model.extend({ defaults: { diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js index 207d88ad3..45792b321 100644 --- a/src/canvas/view/CanvasView.js +++ b/src/canvas/view/CanvasView.js @@ -1,4 +1,5 @@ import Backbone from 'backbone'; +import { bindAll } from 'underscore'; import { on, off, @@ -7,7 +8,8 @@ import { isTextNode, getElRect } from 'utils/mixins'; -const FrameView = require('./FrameView'); +import FrameView from './FrameView'; + const $ = Backbone.$; let timerZoom; @@ -25,7 +27,7 @@ export default Backbone.View.extend({ }, initialize(o) { - _.bindAll(this, 'renderBody', 'onFrameScroll', 'clearOff', 'onKeyPress'); + bindAll(this, 'renderBody', 'onFrameScroll', 'clearOff', 'onKeyPress'); on(window, 'scroll resize', this.clearOff); const { model } = this; this.config = o.config || {}; diff --git a/src/canvas/view/FrameView.js b/src/canvas/view/FrameView.js index 78519c145..c13b83a4a 100644 --- a/src/canvas/view/FrameView.js +++ b/src/canvas/view/FrameView.js @@ -1,10 +1,11 @@ +import Backbone from 'backbone'; import { bindAll } from 'underscore'; import { appendVNodes, empty } from 'utils/dom'; const motionsEv = 'transitionend oTransitionEnd transitionend webkitTransitionEnd'; -export default require('backbone').View.extend({ +export default Backbone.View.extend({ tagName: 'iframe', attributes: { diff --git a/src/code_manager/index.js b/src/code_manager/index.js index 94e2b844a..e0689f523 100644 --- a/src/code_manager/index.js +++ b/src/code_manager/index.js @@ -18,17 +18,16 @@ * @module CodeManager */ import { isUndefined } from 'underscore'; +import defaults from './config/config'; +import gHtml from './model/HtmlGenerator'; +import gCss from './model/CssGenerator'; +import gJson from './model/JsonGenerator'; +import gJs from './model/JsGenerator'; +import eCM from './model/CodeMirrorEditor'; +import editorView from './view/EditorView'; export default () => { - var c = {}, - defaults = require('./config/config'), - gHtml = require('./model/HtmlGenerator'), - gCss = require('./model/CssGenerator'), - gJson = require('./model/JsonGenerator'), - gJs = require('./model/JsGenerator'), - eCM = require('./model/CodeMirrorEditor'), - editorView = require('./view/EditorView'); - + var c = {}; var generators = {}, defGenerators = {}, viewers = {}, diff --git a/src/code_manager/model/CodeMirrorEditor.js b/src/code_manager/model/CodeMirrorEditor.js index 49a1795d9..3139264ce 100644 --- a/src/code_manager/model/CodeMirrorEditor.js +++ b/src/code_manager/model/CodeMirrorEditor.js @@ -1,9 +1,9 @@ import { bindAll } from 'underscore'; import Backbone from 'backbone'; -var CodeMirror = require('codemirror/lib/codemirror'); -var htmlMode = require('codemirror/mode/htmlmixed/htmlmixed'); -var cssMode = require('codemirror/mode/css/css'); -var formatting = require('codemirror-formatting'); +import CodeMirror from 'codemirror/lib/codemirror'; +import 'codemirror/mode/htmlmixed/htmlmixed'; +import 'codemirror/mode/css/css'; +import 'codemirror-formatting'; export default Backbone.Model.extend({ defaults: { diff --git a/src/code_manager/model/CssGenerator.js b/src/code_manager/model/CssGenerator.js index 20547c10d..5c30d2a13 100644 --- a/src/code_manager/model/CssGenerator.js +++ b/src/code_manager/model/CssGenerator.js @@ -1,8 +1,9 @@ +import Backbone from 'backbone'; import { isUndefined, each } from 'underscore'; const maxValue = Number.MAX_VALUE; -export default require('backbone').Model.extend({ +export default Backbone.Model.extend({ initialize() { this.compCls = []; this.ids = []; diff --git a/src/commands/index.js b/src/commands/index.js index d5a43fe3e..c7fadf0b1 100644 --- a/src/commands/index.js +++ b/src/commands/index.js @@ -179,7 +179,7 @@ export default () => { defaultCommands['core:redo'] = e => e.UndoManager.redo(); commandsDef.forEach(item => { const oldCmd = item[2]; - const cmd = require(`./view/${item[1]}`); + const cmd = require(`./view/${item[1]}`).default; const cmdName = `core:${item[0]}`; defaultCommands[cmdName] = cmd; if (oldCmd) { diff --git a/src/commands/model/Commands.js b/src/commands/model/Commands.js index 9c7f8881a..69db0117f 100644 --- a/src/commands/model/Commands.js +++ b/src/commands/model/Commands.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -var Command = require('./Command'); +import Command from './Command'; export default Backbone.Collection.extend({ model: Command diff --git a/src/commands/view/DeleteComponent.js b/src/commands/view/DeleteComponent.js index 6665a30b8..5b470edc9 100644 --- a/src/commands/view/DeleteComponent.js +++ b/src/commands/view/DeleteComponent.js @@ -1,11 +1,12 @@ -import _ from 'underscore'; +import { extend, bindAll } from 'underscore'; import Backbone from 'backbone'; -const SelectComponent = require('./SelectComponent'); +import SelectComponent from './SelectComponent'; + const $ = Backbone.$; -export default _.extend({}, SelectComponent, { +export default extend({}, SelectComponent, { init(o) { - _.bindAll(this, 'startDelete', 'stopDelete', 'onDelete'); + bindAll(this, 'startDelete', 'stopDelete', 'onDelete'); this.hoverClass = this.pfx + 'hover-delete'; this.badgeClass = this.pfx + 'badge-red'; }, diff --git a/src/commands/view/MoveComponent.js b/src/commands/view/MoveComponent.js index d77963242..0f04b3fb7 100644 --- a/src/commands/view/MoveComponent.js +++ b/src/commands/view/MoveComponent.js @@ -1,15 +1,15 @@ -import _ from 'underscore'; +import { extend, bindAll } from 'underscore'; import Backbone from 'backbone'; import { on, off } from 'utils/mixins'; +import SelectComponent from './SelectComponent'; +import SelectPosition from './SelectPosition'; -const SelectComponent = require('./SelectComponent'); -const SelectPosition = require('./SelectPosition'); const $ = Backbone.$; -export default _.extend({}, SelectPosition, SelectComponent, { +export default extend({}, SelectPosition, SelectComponent, { init(o) { SelectComponent.init.apply(this, arguments); - _.bindAll(this, 'initSorter', 'rollback', 'onEndMove'); + bindAll(this, 'initSorter', 'rollback', 'onEndMove'); this.opt = o; this.hoverClass = this.ppfx + 'highlighter-warning'; this.badgeClass = this.ppfx + 'badge-warning'; diff --git a/src/commands/view/OpenLayers.js b/src/commands/view/OpenLayers.js index 40ddd9753..124ec5d6e 100644 --- a/src/commands/view/OpenLayers.js +++ b/src/commands/view/OpenLayers.js @@ -1,5 +1,6 @@ import Backbone from 'backbone'; -const Layers = require('navigator'); +import Layers from 'navigator'; + const $ = Backbone.$; export default { diff --git a/src/commands/view/OpenStyleManager.js b/src/commands/view/OpenStyleManager.js index caa8c7bcb..d90456969 100644 --- a/src/commands/view/OpenStyleManager.js +++ b/src/commands/view/OpenStyleManager.js @@ -1,5 +1,6 @@ import Backbone from 'backbone'; -const StyleManager = require('style_manager'); +import StyleManager from 'style_manager'; + const $ = Backbone.$; export default { diff --git a/src/commands/view/OpenTraitManager.js b/src/commands/view/OpenTraitManager.js index d4206a1aa..c2ab0f413 100644 --- a/src/commands/view/OpenTraitManager.js +++ b/src/commands/view/OpenTraitManager.js @@ -1,4 +1,6 @@ -const $ = require('backbone').$; +import Backbone from 'backbone'; + +const $ = Backbone.$; export default { run(editor, sender) { diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js index ef4b81a7a..ad27ddf7a 100644 --- a/src/commands/view/SelectComponent.js +++ b/src/commands/view/SelectComponent.js @@ -1,9 +1,10 @@ +import Backbone from 'backbone'; import { bindAll, isElement, isUndefined } from 'underscore'; import { on, off, getUnitFromValue, isTaggableNode } from 'utils/mixins'; +import ToolbarView from 'dom_components/view/ToolbarView'; +import Toolbar from 'dom_components/model/Toolbar'; -const ToolbarView = require('dom_components/view/ToolbarView'); -const Toolbar = require('dom_components/model/Toolbar'); -const $ = require('backbone').$; +const $ = Backbone.$; let showOffsets; export default { diff --git a/src/css_composer/index.js b/src/css_composer/index.js index 8bfed7be9..ba5fe803f 100644 --- a/src/css_composer/index.js +++ b/src/css_composer/index.js @@ -28,17 +28,16 @@ */ import { isArray } from 'underscore'; +import defaults from './config/config'; +import CssRule from './model/CssRule'; +import CssRules from './model/CssRules'; +import CssRulesView from './view/CssRulesView'; +import Selectors from 'selector_manager/model/Selectors'; +import Selector from 'selector_manager/model/Selector'; export default () => { let em; - var c = {}, - defaults = require('./config/config'), - CssRule = require('./model/CssRule'), - CssRules = require('./model/CssRules'), - CssRulesView = require('./view/CssRulesView'); - const Selectors = require('selector_manager/model/Selectors'); - const Selector = require('selector_manager/model/Selector'); - + var c = {}; var rules, rulesView; return { diff --git a/src/css_composer/model/CssRule.js b/src/css_composer/model/CssRule.js index aa1976224..174d4e027 100644 --- a/src/css_composer/model/CssRule.js +++ b/src/css_composer/model/CssRule.js @@ -1,9 +1,8 @@ -import _ from 'underscore'; +import { map } from 'underscore'; import Backbone from 'backbone'; import Styleable from 'domain_abstract/model/Styleable'; import { isEmpty, forEach } from 'underscore'; - -var Selectors = require('selector_manager/model/Selectors'); +import Selectors from 'selector_manager/model/Selectors'; export default Backbone.Model.extend(Styleable).extend({ defaults: { @@ -161,8 +160,8 @@ export default Backbone.Model.extend(Styleable).extend({ //var a2 = _.pluck(this.get('selectors').models, cId); if (!(selectors instanceof Array) && !selectors.models) selectors = [selectors]; - var a1 = _.map(selectors.models || selectors, model => model.get('name')); - var a2 = _.map(this.get('selectors').models, model => model.get('name')); + var a1 = map(selectors.models || selectors, model => model.get('name')); + var a2 = map(this.get('selectors').models, model => model.get('name')); var f = false; if (a1.length !== a2.length) return f; diff --git a/src/css_composer/model/CssRules.js b/src/css_composer/model/CssRules.js index 3ccb4ed77..873a37ade 100644 --- a/src/css_composer/model/CssRules.js +++ b/src/css_composer/model/CssRules.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -var CssRule = require('./CssRule'); +import CssRule from './CssRule'; export default Backbone.Collection.extend({ initialize(models, opt) { diff --git a/src/css_composer/view/CssGroupRuleView.js b/src/css_composer/view/CssGroupRuleView.js index 70f4feb73..cc4f78182 100644 --- a/src/css_composer/view/CssGroupRuleView.js +++ b/src/css_composer/view/CssGroupRuleView.js @@ -1,4 +1,6 @@ -export default require('./CssRuleView').extend({ +import CssRuleView from './CssRuleView'; + +export default CssRuleView.extend({ _createElement: function(tagName) { return document.createTextNode(''); }, diff --git a/src/css_composer/view/CssRuleView.js b/src/css_composer/view/CssRuleView.js index 8902e505b..9ca35b986 100644 --- a/src/css_composer/view/CssRuleView.js +++ b/src/css_composer/view/CssRuleView.js @@ -1,4 +1,6 @@ -export default require('backbone').View.extend({ +import Backbone from 'backbone'; + +export default Backbone.View.extend({ tagName: 'style', initialize(o = {}) { diff --git a/src/css_composer/view/CssRulesView.js b/src/css_composer/view/CssRulesView.js index a6e4949ea..891ca9c12 100644 --- a/src/css_composer/view/CssRulesView.js +++ b/src/css_composer/view/CssRulesView.js @@ -1,6 +1,7 @@ import Backbone from 'backbone'; -const CssRuleView = require('./CssRuleView'); -const CssGroupRuleView = require('./CssGroupRuleView'); +import CssRuleView from './CssRuleView'; +import CssGroupRuleView from './CssGroupRuleView'; + const $ = Backbone.$; const getBlockId = (pfx, order) => diff --git a/src/device_manager/index.js b/src/device_manager/index.js index dec29f370..70f51ecac 100644 --- a/src/device_manager/index.js +++ b/src/device_manager/index.js @@ -20,12 +20,12 @@ * * @module DeviceManager */ +import defaults from './config/config'; +import Devices from './model/Devices'; +import DevicesView from './view/DevicesView'; export default () => { - var c = {}, - defaults = require('./config/config'), - Devices = require('./model/Devices'), - DevicesView = require('./view/DevicesView'); + var c = {}; var devices, view; return { diff --git a/src/device_manager/model/Device.js b/src/device_manager/model/Device.js index b03677eb1..07077470e 100644 --- a/src/device_manager/model/Device.js +++ b/src/device_manager/model/Device.js @@ -1,4 +1,3 @@ -import { isUndefined } from 'underscore'; import Backbone from 'backbone'; export default Backbone.Model.extend({ diff --git a/src/device_manager/model/Devices.js b/src/device_manager/model/Devices.js index da79868fb..7964e4f3f 100644 --- a/src/device_manager/model/Devices.js +++ b/src/device_manager/model/Devices.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -var Device = require('./Device'); +import Device from './Device'; export default Backbone.Collection.extend({ model: Device, diff --git a/src/device_manager/view/DevicesView.js b/src/device_manager/view/DevicesView.js index d3fc757bc..3f872a800 100644 --- a/src/device_manager/view/DevicesView.js +++ b/src/device_manager/view/DevicesView.js @@ -1,8 +1,8 @@ -import _ from 'underscore'; +import { template } from 'underscore'; import Backbone from 'backbone'; export default Backbone.View.extend({ - template: _.template(` + template: template(`
<%= deviceLabel %>
diff --git a/src/dom_components/index.js b/src/dom_components/index.js index 92b6d9d57..5259166c1 100644 --- a/src/dom_components/index.js +++ b/src/dom_components/index.js @@ -28,103 +28,136 @@ * @module DomComponents */ import Backbone from 'backbone'; -import { isEmpty, isString, isObject, isArray, result } from 'underscore'; +import { isEmpty, isObject, isArray, result } from 'underscore'; +import defaults from './config/config'; +import Component from './model/Component'; +import Components from './model/Components'; +import ComponentView from './view/ComponentView'; +import ComponentsView from './view/ComponentsView'; +import ComponentTableCell from './model/ComponentTableCell'; +import ComponentTableCellView from './view/ComponentTableCellView'; +import ComponentTableRow from './model/ComponentTableRow'; +import ComponentTableRowView from './view/ComponentTableRowView'; +import ComponentTable from './model/ComponentTable'; +import ComponentTableView from './view/ComponentTableView'; +import ComponentTableHead from './model/ComponentTableHead'; +import ComponentTableHeadView from './view/ComponentTableHeadView'; +import ComponentTableBody from './model/ComponentTableBody'; +import ComponentTableBodyView from './view/ComponentTableBodyView'; +import ComponentTableFoot from './model/ComponentTableFoot'; +import ComponentTableFootView from './view/ComponentTableFootView'; +import ComponentMap from './model/ComponentMap'; +import ComponentMapView from './view/ComponentMapView'; +import ComponentLink from './model/ComponentLink'; +import ComponentLinkView from './view/ComponentLinkView'; +import ComponentLabel from './model/ComponentLabel'; +import ComponentLabelView from './view/ComponentLabelView'; +import ComponentVideo from './model/ComponentVideo'; +import ComponentVideoView from './view/ComponentVideoView'; +import ComponentImage from './model/ComponentImage'; +import ComponentImageView from './view/ComponentImageView'; +import ComponentScript from './model/ComponentScript'; +import ComponentScriptView from './view/ComponentScriptView'; +import ComponentSvg from './model/ComponentSvg'; +import ComponentSvgView from './view/ComponentSvgView'; +import ComponentComment from './model/ComponentComment'; +import ComponentCommentView from './view/ComponentCommentView'; +import ComponentTextNode from './model/ComponentTextNode'; +import ComponentTextNodeView from './view/ComponentTextNodeView'; +import ComponentText from './model/ComponentText'; +import ComponentTextView from './view/ComponentTextView'; +import ComponentWrapper from './model/ComponentWrapper'; export default () => { var c = {}; let em; - const defaults = require('./config/config'); - const Component = require('./model/Component'); - const ComponentView = require('./view/ComponentView'); - const Components = require('./model/Components'); - const ComponentsView = require('./view/ComponentsView'); const componentsById = {}; var component, componentView; var componentTypes = [ { id: 'cell', - model: require('./model/ComponentTableCell'), - view: require('./view/ComponentTableCellView') + model: ComponentTableCell, + view: ComponentTableCellView }, { id: 'row', - model: require('./model/ComponentTableRow'), - view: require('./view/ComponentTableRowView') + model: ComponentTableRow, + view: ComponentTableRowView }, { id: 'table', - model: require('./model/ComponentTable'), - view: require('./view/ComponentTableView') + model: ComponentTable, + view: ComponentTableView }, { id: 'thead', - model: require('./model/ComponentTableHead'), - view: require('./view/ComponentTableHeadView') + model: ComponentTableHead, + view: ComponentTableHeadView }, { id: 'tbody', - model: require('./model/ComponentTableBody'), - view: require('./view/ComponentTableBodyView') + model: ComponentTableBody, + view: ComponentTableBodyView }, { id: 'tfoot', - model: require('./model/ComponentTableFoot'), - view: require('./view/ComponentTableFootView') + model: ComponentTableFoot, + view: ComponentTableFootView }, { id: 'map', - model: require('./model/ComponentMap'), - view: require('./view/ComponentMapView') + model: ComponentMap, + view: ComponentMapView }, { id: 'link', - model: require('./model/ComponentLink'), - view: require('./view/ComponentLinkView') + model: ComponentLink, + view: ComponentLinkView }, { id: 'label', - model: require('./model/ComponentLabel'), - view: require('./view/ComponentLabelView') + model: ComponentLabel, + view: ComponentLabelView }, { id: 'video', - model: require('./model/ComponentVideo'), - view: require('./view/ComponentVideoView') + model: ComponentVideo, + view: ComponentVideoView }, { id: 'image', - model: require('./model/ComponentImage'), - view: require('./view/ComponentImageView') + model: ComponentImage, + view: ComponentImageView }, { id: 'script', - model: require('./model/ComponentScript'), - view: require('./view/ComponentScriptView') + model: ComponentScript, + view: ComponentScriptView }, { id: 'svg', - model: require('./model/ComponentSvg'), - view: require('./view/ComponentSvgView') + model: ComponentSvg, + view: ComponentSvgView }, { id: 'comment', - model: require('./model/ComponentComment'), - view: require('./view/ComponentCommentView') + model: ComponentComment, + view: ComponentCommentView }, { id: 'textnode', - model: require('./model/ComponentTextNode'), - view: require('./view/ComponentTextNodeView') + model: ComponentTextNode, + view: ComponentTextNodeView }, { id: 'text', - model: require('./model/ComponentText'), - view: require('./view/ComponentTextView') + model: ComponentText, + view: ComponentTextView }, { id: 'wrapper', - model: require('./model/ComponentWrapper'), + model: ComponentWrapper, view: ComponentView }, { diff --git a/src/dom_components/model/Component.js b/src/dom_components/model/Component.js index 1ef92a893..4a6dbb836 100644 --- a/src/dom_components/model/Component.js +++ b/src/dom_components/model/Component.js @@ -6,20 +6,19 @@ import { isEmpty, isBoolean, has, - clone, isString, forEach, result, keys } from 'underscore'; -import { shallowDiff, hasDnd } from 'utils/mixins'; +import { shallowDiff } from 'utils/mixins'; import Styleable from 'domain_abstract/model/Styleable'; +import Backbone from 'backbone'; +import Components from './Components'; +import Selector from 'selector_manager/model/Selector'; +import Selectors from 'selector_manager/model/Selectors'; +import Traits from 'trait_manager/model/Traits'; -const Backbone = require('backbone'); -const Components = require('./Components'); -const Selector = require('selector_manager/model/Selector'); -const Selectors = require('selector_manager/model/Selectors'); -const Traits = require('trait_manager/model/Traits'); const componentList = {}; let componentIndex = 0; diff --git a/src/dom_components/model/ComponentComment.js b/src/dom_components/model/ComponentComment.js index 0871fe446..845d3439c 100644 --- a/src/dom_components/model/ComponentComment.js +++ b/src/dom_components/model/ComponentComment.js @@ -1,4 +1,4 @@ -const Component = require('./ComponentTextNode'); +import Component from './ComponentTextNode'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentImage.js b/src/dom_components/model/ComponentImage.js index f3ba9f813..040c17bb9 100644 --- a/src/dom_components/model/ComponentImage.js +++ b/src/dom_components/model/ComponentImage.js @@ -1,5 +1,6 @@ import { result } from 'underscore'; -const Component = require('./Component'); +import Component from './Component'; + const svgAttrs = 'xmlns="http://www.w3.org/2000/svg" width="100" viewBox="0 0 24 24" style="fill: rgba(0,0,0,0.15); transform: scale(0.75)"'; diff --git a/src/dom_components/model/ComponentLabel.js b/src/dom_components/model/ComponentLabel.js index f0dfc407b..f51095ed0 100644 --- a/src/dom_components/model/ComponentLabel.js +++ b/src/dom_components/model/ComponentLabel.js @@ -1,4 +1,4 @@ -const Component = require('./ComponentText'); +import Component from './ComponentText'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentLink.js b/src/dom_components/model/ComponentLink.js index 9d4324624..e9e559610 100644 --- a/src/dom_components/model/ComponentLink.js +++ b/src/dom_components/model/ComponentLink.js @@ -1,4 +1,4 @@ -const Component = require('./ComponentText'); +import Component from './ComponentText'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentMap.js b/src/dom_components/model/ComponentMap.js index 75eebef63..6dd1c59de 100644 --- a/src/dom_components/model/ComponentMap.js +++ b/src/dom_components/model/ComponentMap.js @@ -1,5 +1,5 @@ -const Component = require('./ComponentImage'); -const OComponent = require('./Component'); +import Component from './ComponentImage'; +import OComponent from './Component'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentScript.js b/src/dom_components/model/ComponentScript.js index 8f1f5acd0..8ff2b7b48 100644 --- a/src/dom_components/model/ComponentScript.js +++ b/src/dom_components/model/ComponentScript.js @@ -1,4 +1,4 @@ -const Component = require('./Component'); +import Component from './Component'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentSvg.js b/src/dom_components/model/ComponentSvg.js index bf85869a5..348d9e4d1 100644 --- a/src/dom_components/model/ComponentSvg.js +++ b/src/dom_components/model/ComponentSvg.js @@ -1,4 +1,4 @@ -const Component = require('./Component'); +import Component from './Component'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentTable.js b/src/dom_components/model/ComponentTable.js index 70f67d811..79573e56d 100644 --- a/src/dom_components/model/ComponentTable.js +++ b/src/dom_components/model/ComponentTable.js @@ -1,4 +1,4 @@ -const Component = require('./Component'); +import Component from './Component'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentTableBody.js b/src/dom_components/model/ComponentTableBody.js index 41df5165f..dfb77e658 100644 --- a/src/dom_components/model/ComponentTableBody.js +++ b/src/dom_components/model/ComponentTableBody.js @@ -1,4 +1,4 @@ -const Component = require('./Component'); +import Component from './Component'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentTableCell.js b/src/dom_components/model/ComponentTableCell.js index 42cf35ea3..9fa1024bf 100644 --- a/src/dom_components/model/ComponentTableCell.js +++ b/src/dom_components/model/ComponentTableCell.js @@ -1,4 +1,4 @@ -const Component = require('./Component'); +import Component from './Component'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentTableFoot.js b/src/dom_components/model/ComponentTableFoot.js index 135735dca..e7ae0a9f1 100644 --- a/src/dom_components/model/ComponentTableFoot.js +++ b/src/dom_components/model/ComponentTableFoot.js @@ -1,4 +1,4 @@ -const ComponentTableBody = require('./ComponentTableBody'); +import ComponentTableBody from './ComponentTableBody'; export default ComponentTableBody.extend( { diff --git a/src/dom_components/model/ComponentTableHead.js b/src/dom_components/model/ComponentTableHead.js index 570bf5a12..f1f82626f 100644 --- a/src/dom_components/model/ComponentTableHead.js +++ b/src/dom_components/model/ComponentTableHead.js @@ -1,4 +1,4 @@ -const ComponentTableBody = require('./ComponentTableBody'); +import ComponentTableBody from './ComponentTableBody'; export default ComponentTableBody.extend( { diff --git a/src/dom_components/model/ComponentTableRow.js b/src/dom_components/model/ComponentTableRow.js index 5ca140b02..1e90eae21 100644 --- a/src/dom_components/model/ComponentTableRow.js +++ b/src/dom_components/model/ComponentTableRow.js @@ -1,4 +1,4 @@ -const Component = require('./Component'); +import Component from './Component'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentText.js b/src/dom_components/model/ComponentText.js index 9c7a38cc6..5d845eb8e 100644 --- a/src/dom_components/model/ComponentText.js +++ b/src/dom_components/model/ComponentText.js @@ -1,4 +1,4 @@ -const Component = require('./Component'); +import Component from './Component'; export default Component.extend({ defaults: { diff --git a/src/dom_components/model/ComponentTextNode.js b/src/dom_components/model/ComponentTextNode.js index d40f6990c..98317d272 100644 --- a/src/dom_components/model/ComponentTextNode.js +++ b/src/dom_components/model/ComponentTextNode.js @@ -1,4 +1,4 @@ -const Component = require('./Component'); +import Component from './Component'; export default Component.extend( { diff --git a/src/dom_components/model/ComponentVideo.js b/src/dom_components/model/ComponentVideo.js index 546aa83c1..955c2de64 100644 --- a/src/dom_components/model/ComponentVideo.js +++ b/src/dom_components/model/ComponentVideo.js @@ -1,5 +1,6 @@ -const Component = require('./ComponentImage'); -const OComponent = require('./Component'); +import Component from './ComponentImage'; +import OComponent from './Component'; + const yt = 'yt'; const vi = 'vi'; const ytnc = 'ytnc'; diff --git a/src/dom_components/model/ComponentWrapper.js b/src/dom_components/model/ComponentWrapper.js index bcc90409f..111f509ee 100644 --- a/src/dom_components/model/ComponentWrapper.js +++ b/src/dom_components/model/ComponentWrapper.js @@ -1,5 +1,7 @@ // We need this one just to identify better the wrapper type -export default require('./Component').extend( +import Component from './Component'; + +export default Component.extend( {}, { isComponent() { diff --git a/src/dom_components/model/Components.js b/src/dom_components/model/Components.js index 998e09352..86da3c4eb 100644 --- a/src/dom_components/model/Components.js +++ b/src/dom_components/model/Components.js @@ -1,6 +1,6 @@ +import Backbone from 'backbone'; import { isEmpty, isArray, isString } from 'underscore'; -const Backbone = require('backbone'); let Component; export default Backbone.Collection.extend({ @@ -47,7 +47,7 @@ export default Backbone.Collection.extend({ const cssc = em.get('CssComposer'); const parsed = em.get('Parser').parseHtml(value); // We need this to avoid duplicate IDs - if (!Component) Component = require('./Component'); + if (!Component) Component = require('./Component').default; Component.checkId(parsed.html, parsed.css, this.opt.domc.componentsById); if (parsed.css && cssc && !opt.temporary) { diff --git a/src/dom_components/model/Toolbar.js b/src/dom_components/model/Toolbar.js index 7f4737e01..1ae5dfa6b 100644 --- a/src/dom_components/model/Toolbar.js +++ b/src/dom_components/model/Toolbar.js @@ -1,4 +1,4 @@ -const Backbone = require('backbone'); -const ToolbarButton = require('./ToolbarButton'); +import Backbone from 'backbone'; +import ToolbarButton from './ToolbarButton'; export default Backbone.Collection.extend({ model: ToolbarButton }); diff --git a/src/dom_components/model/ToolbarButton.js b/src/dom_components/model/ToolbarButton.js index 9e718dae3..bed924070 100644 --- a/src/dom_components/model/ToolbarButton.js +++ b/src/dom_components/model/ToolbarButton.js @@ -1,4 +1,4 @@ -const Backbone = require('backbone'); +import Backbone from 'backbone'; export default Backbone.Model.extend({ defaults: { diff --git a/src/dom_components/view/ComponentCommentView.js b/src/dom_components/view/ComponentCommentView.js index 51d1d983c..9677fb171 100644 --- a/src/dom_components/view/ComponentCommentView.js +++ b/src/dom_components/view/ComponentCommentView.js @@ -1,4 +1,4 @@ -const ComponentView = require('./ComponentTextNodeView'); +import ComponentView from './ComponentTextNodeView'; export default ComponentView.extend({ _createElement() { diff --git a/src/dom_components/view/ComponentImageView.js b/src/dom_components/view/ComponentImageView.js index 930c3d193..355b4ece8 100644 --- a/src/dom_components/view/ComponentImageView.js +++ b/src/dom_components/view/ComponentImageView.js @@ -1,5 +1,5 @@ import { isString } from 'underscore'; -const ComponentView = require('./ComponentView'); +import ComponentView from './ComponentView'; export default ComponentView.extend({ tagName: 'img', diff --git a/src/dom_components/view/ComponentLabelView.js b/src/dom_components/view/ComponentLabelView.js index 7ae92405e..fda67d77f 100644 --- a/src/dom_components/view/ComponentLabelView.js +++ b/src/dom_components/view/ComponentLabelView.js @@ -1 +1,3 @@ -export default require('./ComponentLinkView').extend({}); +import ComponentLinkView from './ComponentLinkView'; + +export default ComponentLinkView.extend({}); diff --git a/src/dom_components/view/ComponentLinkView.js b/src/dom_components/view/ComponentLinkView.js index 0b60b9283..d20222b82 100644 --- a/src/dom_components/view/ComponentLinkView.js +++ b/src/dom_components/view/ComponentLinkView.js @@ -1,4 +1,4 @@ -const ComponentView = require('./ComponentTextView'); +import ComponentView from './ComponentTextView'; export default ComponentView.extend({ render(...args) { diff --git a/src/dom_components/view/ComponentMapView.js b/src/dom_components/view/ComponentMapView.js index 0168c3c3b..eda50c23d 100644 --- a/src/dom_components/view/ComponentMapView.js +++ b/src/dom_components/view/ComponentMapView.js @@ -1,5 +1,5 @@ -var Backbone = require('backbone'); -var ComponentView = require('./ComponentImageView'); +import Backbone from 'backbone'; +import ComponentView from './ComponentImageView'; export default ComponentView.extend({ tagName: 'div', diff --git a/src/dom_components/view/ComponentScriptView.js b/src/dom_components/view/ComponentScriptView.js index 16cbabc9f..9828e3a9f 100644 --- a/src/dom_components/view/ComponentScriptView.js +++ b/src/dom_components/view/ComponentScriptView.js @@ -1,5 +1,5 @@ -var Backbone = require('backbone'); -var ComponentView = require('./ComponentImageView'); +import Backbone from 'backbone'; +import ComponentView from './ComponentImageView'; export default ComponentView.extend({ tagName: 'script', diff --git a/src/dom_components/view/ComponentSvgView.js b/src/dom_components/view/ComponentSvgView.js index 77441e0b7..2b9163d6a 100644 --- a/src/dom_components/view/ComponentSvgView.js +++ b/src/dom_components/view/ComponentSvgView.js @@ -1,4 +1,4 @@ -const ComponentView = require('./ComponentView'); +import ComponentView from './ComponentView'; export default ComponentView.extend({ _createElement: function(tagName) { diff --git a/src/dom_components/view/ComponentTableBodyView.js b/src/dom_components/view/ComponentTableBodyView.js index e79bd4a94..8791a8841 100644 --- a/src/dom_components/view/ComponentTableBodyView.js +++ b/src/dom_components/view/ComponentTableBodyView.js @@ -1 +1,3 @@ -export default require('./ComponentView').extend({}); +import ComponentView from './ComponentView'; + +export default ComponentView.extend({}); diff --git a/src/dom_components/view/ComponentTableCellView.js b/src/dom_components/view/ComponentTableCellView.js index e79bd4a94..8791a8841 100644 --- a/src/dom_components/view/ComponentTableCellView.js +++ b/src/dom_components/view/ComponentTableCellView.js @@ -1 +1,3 @@ -export default require('./ComponentView').extend({}); +import ComponentView from './ComponentView'; + +export default ComponentView.extend({}); diff --git a/src/dom_components/view/ComponentTableFootView.js b/src/dom_components/view/ComponentTableFootView.js index e79bd4a94..8791a8841 100644 --- a/src/dom_components/view/ComponentTableFootView.js +++ b/src/dom_components/view/ComponentTableFootView.js @@ -1 +1,3 @@ -export default require('./ComponentView').extend({}); +import ComponentView from './ComponentView'; + +export default ComponentView.extend({}); diff --git a/src/dom_components/view/ComponentTableHeadView.js b/src/dom_components/view/ComponentTableHeadView.js index e79bd4a94..8791a8841 100644 --- a/src/dom_components/view/ComponentTableHeadView.js +++ b/src/dom_components/view/ComponentTableHeadView.js @@ -1 +1,3 @@ -export default require('./ComponentView').extend({}); +import ComponentView from './ComponentView'; + +export default ComponentView.extend({}); diff --git a/src/dom_components/view/ComponentTableRowView.js b/src/dom_components/view/ComponentTableRowView.js index e79bd4a94..8791a8841 100644 --- a/src/dom_components/view/ComponentTableRowView.js +++ b/src/dom_components/view/ComponentTableRowView.js @@ -1 +1,3 @@ -export default require('./ComponentView').extend({}); +import ComponentView from './ComponentView'; + +export default ComponentView.extend({}); diff --git a/src/dom_components/view/ComponentTableView.js b/src/dom_components/view/ComponentTableView.js index 6498ff143..9d566d616 100644 --- a/src/dom_components/view/ComponentTableView.js +++ b/src/dom_components/view/ComponentTableView.js @@ -1,3 +1,5 @@ -export default require('./ComponentView').extend({ +import ComponentView from './ComponentView'; + +export default ComponentView.extend({ events: {} }); diff --git a/src/dom_components/view/ComponentTextNodeView.js b/src/dom_components/view/ComponentTextNodeView.js index eafd907b1..7c60d8660 100644 --- a/src/dom_components/view/ComponentTextNodeView.js +++ b/src/dom_components/view/ComponentTextNodeView.js @@ -1,4 +1,6 @@ -export default require('backbone').View.extend({ +import Backbone from 'backbone'; + +export default Backbone.View.extend({ initialize() { const { $el, model } = this; $el.data('model', model); diff --git a/src/dom_components/view/ComponentTextView.js b/src/dom_components/view/ComponentTextView.js index a2eadc899..65285c034 100644 --- a/src/dom_components/view/ComponentTextView.js +++ b/src/dom_components/view/ComponentTextView.js @@ -1,6 +1,5 @@ import { on, off } from 'utils/mixins'; - -const ComponentView = require('./ComponentView'); +import ComponentView from './ComponentView'; export default ComponentView.extend({ events: { diff --git a/src/dom_components/view/ComponentVideoView.js b/src/dom_components/view/ComponentVideoView.js index 3a5899c45..d09438c07 100644 --- a/src/dom_components/view/ComponentVideoView.js +++ b/src/dom_components/view/ComponentVideoView.js @@ -1,6 +1,5 @@ -var Backbone = require('backbone'); -var ComponentView = require('./ComponentImageView'); -var OComponentView = require('./ComponentView'); +import ComponentView from './ComponentImageView'; +import OComponentView from './ComponentView'; export default ComponentView.extend({ tagName: 'div', diff --git a/src/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js index f51d3806f..5cc5eea90 100644 --- a/src/dom_components/view/ComponentView.js +++ b/src/dom_components/view/ComponentView.js @@ -1,9 +1,8 @@ import Backbone from 'backbone'; import { isArray, isEmpty, each, keys } from 'underscore'; - -const Components = require('../model/Components'); -const ComponentsView = require('./ComponentsView'); -const Selectors = require('selector_manager/model/Selectors'); +import Components from '../model/Components'; +import ComponentsView from './ComponentsView'; +import Selectors from 'selector_manager/model/Selectors'; export default Backbone.View.extend({ className() { diff --git a/src/dom_components/view/ComponentsView.js b/src/dom_components/view/ComponentsView.js index bd5192f57..128abcd13 100644 --- a/src/dom_components/view/ComponentsView.js +++ b/src/dom_components/view/ComponentsView.js @@ -79,7 +79,7 @@ export default Backbone.View.extend({ * @private * */ addToCollection(model, fragmentEl, index) { - if (!this.compView) this.compView = require('./ComponentView'); + if (!this.compView) this.compView = require('./ComponentView').default; const { config, opts } = this; const fragment = fragmentEl || null; const dt = opts.componentTypes; diff --git a/src/dom_components/view/ToolbarButtonView.js b/src/dom_components/view/ToolbarButtonView.js index 7dd30bdb2..164302e3f 100644 --- a/src/dom_components/view/ToolbarButtonView.js +++ b/src/dom_components/view/ToolbarButtonView.js @@ -1,4 +1,4 @@ -var Backbone = require('backbone'); +import Backbone from 'backbone'; export default Backbone.View.extend({ events() { diff --git a/src/dom_components/view/ToolbarView.js b/src/dom_components/view/ToolbarView.js index 8414859ac..ff920b8b0 100644 --- a/src/dom_components/view/ToolbarView.js +++ b/src/dom_components/view/ToolbarView.js @@ -1,5 +1,5 @@ -const DomainViews = require('domain_abstract/view/DomainViews'); -const ToolbarButtonView = require('./ToolbarButtonView'); +import DomainViews from 'domain_abstract/view/DomainViews'; +import ToolbarButtonView from './ToolbarButtonView'; export default DomainViews.extend({ itemView: ToolbarButtonView, diff --git a/src/domain_abstract/model/Styleable.js b/src/domain_abstract/model/Styleable.js index 7e4b385af..201598348 100644 --- a/src/domain_abstract/model/Styleable.js +++ b/src/domain_abstract/model/Styleable.js @@ -1,8 +1,9 @@ import { isString, isArray, keys } from 'underscore'; import { shallowDiff } from 'utils/mixins'; +import ParserHtml from 'parser/model/ParserHtml'; -const ParserHtml = require('parser/model/ParserHtml'); const parseStyle = ParserHtml().parseStyle; + export default { parseStyle, diff --git a/src/domain_abstract/model/TypeableCollection.js b/src/domain_abstract/model/TypeableCollection.js index 79d6747bd..faf6affdc 100644 --- a/src/domain_abstract/model/TypeableCollection.js +++ b/src/domain_abstract/model/TypeableCollection.js @@ -1,4 +1,6 @@ import { isFunction } from 'underscore'; +import Backbone from 'backbone'; + const Model = Backbone.Model; const View = Backbone.View; diff --git a/src/domain_abstract/ui/Input.js b/src/domain_abstract/ui/Input.js index 408eef38e..bdd04562f 100644 --- a/src/domain_abstract/ui/Input.js +++ b/src/domain_abstract/ui/Input.js @@ -1,4 +1,5 @@ -const Backbone = require('backbone'); +import Backbone from 'backbone'; + const $ = Backbone.$; export default Backbone.View.extend({ diff --git a/src/domain_abstract/ui/InputColor.js b/src/domain_abstract/ui/InputColor.js index 7a7407097..28e90980d 100644 --- a/src/domain_abstract/ui/InputColor.js +++ b/src/domain_abstract/ui/InputColor.js @@ -1,8 +1,8 @@ import Backbone from 'backbone'; import { isUndefined } from 'underscore'; import ColorPicker from 'utils/ColorPicker'; +import Input from './Input'; -const Input = require('./Input'); const $ = Backbone.$; ColorPicker($); diff --git a/src/domain_abstract/ui/InputNumber.js b/src/domain_abstract/ui/InputNumber.js index 7cf1c7b88..a891472fa 100644 --- a/src/domain_abstract/ui/InputNumber.js +++ b/src/domain_abstract/ui/InputNumber.js @@ -1,7 +1,8 @@ -import { bindAll, isUndefined } from 'underscore'; +import Backbone from 'backbone'; +import { bindAll, isUndefined, indexOf } from 'underscore'; import { on, off } from 'utils/mixins'; -const Input = require('./Input'); -const Backbone = require('backbone'); +import Input from './Input'; + const $ = Backbone.$; export default Input.extend({ @@ -252,7 +253,7 @@ export default Input.extend({ val = !isNaN(val) ? val : defValue; var uN = valCopy.replace(val, ''); // Check if exists as unit - if (_.indexOf(units, uN) >= 0) unit = uN; + if (indexOf(units, uN) >= 0) unit = uN; } } } diff --git a/src/domain_abstract/view/DomainViews.js b/src/domain_abstract/view/DomainViews.js index 3437b28d9..79ecc1824 100644 --- a/src/domain_abstract/view/DomainViews.js +++ b/src/domain_abstract/view/DomainViews.js @@ -1,4 +1,4 @@ -var Backbone = require('backbone'); +import Backbone from 'backbone'; export default Backbone.View.extend({ // Default view diff --git a/src/editor/index.js b/src/editor/index.js index b9a24a516..fad6a444b 100644 --- a/src/editor/index.js +++ b/src/editor/index.js @@ -99,11 +99,11 @@ * @module Editor */ import $ from 'cash-dom'; +import defaults from './config/config'; +import EditorModel from './model/Editor'; +import EditorView from './view/EditorView'; export default (config = {}) => { - const defaults = require('./config/config'); - const EditorModel = require('./model/Editor'); - const EditorView = require('./view/EditorView'); const c = { ...defaults, ...config diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js index 6fdb6aa36..1655d0096 100644 --- a/src/editor/model/Editor.js +++ b/src/editor/model/Editor.js @@ -1,11 +1,6 @@ -import { - isUndefined, - defaults, - isArray, - contains, - toArray, - keys -} from 'underscore'; +import { isUndefined, isArray, contains, toArray, keys } from 'underscore'; +import Backbone from 'backbone'; +import Extender from 'utils/extender'; import { getModel } from 'utils/mixins'; const deps = [ @@ -31,12 +26,11 @@ const deps = [ require('block_manager') ]; -const Backbone = require('backbone'); const { Collection } = Backbone; let timedInterval; let updateItr; -require('utils/extender')({ +Extender({ Backbone: Backbone, $: Backbone.$ }); @@ -181,7 +175,8 @@ export default Backbone.Model.extend({ */ loadModule(moduleName) { const { config } = this; - const Mod = new moduleName(); + const Module = moduleName.default || moduleName; + const Mod = new Module(); const name = Mod.name.charAt(0).toLowerCase() + Mod.name.slice(1); const cfgParent = !isUndefined(config[name]) ? config[name] diff --git a/src/editor/view/EditorView.js b/src/editor/view/EditorView.js index 7b687eafc..2866d2d2c 100644 --- a/src/editor/view/EditorView.js +++ b/src/editor/view/EditorView.js @@ -1,3 +1,4 @@ +import Backbone from 'backbone'; const $ = Backbone.$; export default Backbone.View.extend({ diff --git a/src/keymaps/index.js b/src/keymaps/index.js index f4aa36e8c..75f248116 100644 --- a/src/keymaps/index.js +++ b/src/keymaps/index.js @@ -32,8 +32,7 @@ */ import { isString } from 'underscore'; - -const keymaster = require('keymaster'); +import keymaster from 'keymaster'; export default () => { let em; diff --git a/src/modal_dialog/index.js b/src/modal_dialog/index.js index 13d530b3f..8201917f3 100644 --- a/src/modal_dialog/index.js +++ b/src/modal_dialog/index.js @@ -27,11 +27,12 @@ * @module Modal */ +import defaults from './config/config'; +import ModalM from './model/Modal'; +import ModalView from './view/ModalView'; + export default () => { - var c = {}, - defaults = require('./config/config'), - ModalM = require('./model/Modal'), - ModalView = require('./view/ModalView'); + var c = {}; var model, modal; const triggerEvent = (enable, em) => { diff --git a/src/modal_dialog/model/Modal.js b/src/modal_dialog/model/Modal.js index 2a94140ca..d627beb95 100644 --- a/src/modal_dialog/model/Modal.js +++ b/src/modal_dialog/model/Modal.js @@ -1,4 +1,4 @@ -var Backbone = require('backbone'); +import Backbone from 'backbone'; export default Backbone.Model.extend({ defaults: { diff --git a/src/modal_dialog/view/ModalView.js b/src/modal_dialog/view/ModalView.js index e781cc6dd..797e4f3d9 100644 --- a/src/modal_dialog/view/ModalView.js +++ b/src/modal_dialog/view/ModalView.js @@ -1,4 +1,6 @@ -export default require('backbone').View.extend({ +import Backbone from 'backbone'; + +export default Backbone.View.extend({ template({ pfx, ppfx, content, title }) { return `
diff --git a/src/navigator/view/ItemView.js b/src/navigator/view/ItemView.js index a939908b4..7afc1aec6 100644 --- a/src/navigator/view/ItemView.js +++ b/src/navigator/view/ItemView.js @@ -1,7 +1,8 @@ import { isUndefined, isString } from 'underscore'; import { getModel } from 'utils/mixins'; import Backbone from 'backbone'; -const ComponentView = require('dom_components/view/ComponentView'); +import ComponentView from 'dom_components/view/ComponentView'; + const inputProp = 'contentEditable'; const $ = Backbone.$; let ItemsView; @@ -363,7 +364,7 @@ export default Backbone.View.extend({ const level = this.level + 1; if (isUndefined(ItemsView)) { - ItemsView = require('./ItemsView'); + ItemsView = require('./ItemsView').default; } const children = new ItemsView({ diff --git a/src/navigator/view/ItemsView.js b/src/navigator/view/ItemsView.js index 410d4a078..dcb67a219 100644 --- a/src/navigator/view/ItemsView.js +++ b/src/navigator/view/ItemsView.js @@ -1,6 +1,7 @@ +import Backbone from 'backbone'; import ItemView from './ItemView'; -export default require('backbone').View.extend({ +export default Backbone.View.extend({ initialize(o = {}) { this.opt = o; const config = o.config || {}; diff --git a/src/panels/index.js b/src/panels/index.js index 8d3fe1f5c..7aec2bffd 100644 --- a/src/panels/index.js +++ b/src/panels/index.js @@ -25,14 +25,14 @@ * * @module Panels */ +import defaults from './config/config'; +import Panel from './model/Panel'; +import Panels from './model/Panels'; +import PanelView from './view/PanelView'; +import PanelsView from './view/PanelsView'; export default () => { - var c = {}, - defaults = require('./config/config'), - Panel = require('./model/Panel'), - Panels = require('./model/Panels'), - PanelView = require('./view/PanelView'), - PanelsView = require('./view/PanelsView'); + var c = {}; var panels, PanelsViewObj; return { diff --git a/src/panels/model/Button.js b/src/panels/model/Button.js index 5b3478a02..4869a5470 100644 --- a/src/panels/model/Button.js +++ b/src/panels/model/Button.js @@ -1,4 +1,4 @@ -var Backbone = require('backbone'); +import Backbone from 'backbone'; export default Backbone.Model.extend({ defaults: { @@ -21,7 +21,7 @@ export default Backbone.Model.extend({ initialize(options) { if (this.get('buttons').length) { - var Buttons = require('./Buttons'); + var Buttons = require('./Buttons').default; this.set('buttons', new Buttons(this.get('buttons'))); } } diff --git a/src/panels/model/Buttons.js b/src/panels/model/Buttons.js index d9f631a02..952b420d0 100644 --- a/src/panels/model/Buttons.js +++ b/src/panels/model/Buttons.js @@ -1,5 +1,5 @@ -var Backbone = require('backbone'); -var Button = require('./Button'); +import Backbone from 'backbone'; +import Button from './Button'; export default Backbone.Collection.extend({ model: Button, diff --git a/src/panels/model/Panel.js b/src/panels/model/Panel.js index 5fb6ac92a..9abb493e4 100644 --- a/src/panels/model/Panel.js +++ b/src/panels/model/Panel.js @@ -1,5 +1,5 @@ -var Backbone = require('backbone'); -var Buttons = require('./Buttons'); +import Backbone from 'backbone'; +import Buttons from './Buttons'; export default Backbone.Model.extend({ defaults: { diff --git a/src/panels/model/Panels.js b/src/panels/model/Panels.js index ecc89ae1b..a7cd830d5 100644 --- a/src/panels/model/Panels.js +++ b/src/panels/model/Panels.js @@ -1,5 +1,5 @@ -var Backbone = require('backbone'); -var Panel = require('./Panel'); +import Backbone from 'backbone'; +import Panel from './Panel'; export default Backbone.Collection.extend({ model: Panel diff --git a/src/panels/view/ButtonView.js b/src/panels/view/ButtonView.js index eb8eb2069..fb4063322 100644 --- a/src/panels/view/ButtonView.js +++ b/src/panels/view/ButtonView.js @@ -1,5 +1,6 @@ import Backbone from 'backbone'; import { isString, isObject, isFunction } from 'underscore'; + const $ = Backbone.$; export default Backbone.View.extend({ diff --git a/src/panels/view/ButtonsView.js b/src/panels/view/ButtonsView.js index 80653f6c1..d4e325f28 100644 --- a/src/panels/view/ButtonsView.js +++ b/src/panels/view/ButtonsView.js @@ -1,5 +1,6 @@ -var Backbone = require('backbone'); -var ButtonView = require('./ButtonView'); +import Backbone from 'backbone'; +import ButtonView from './ButtonView'; +import { result } from 'underscore'; export default Backbone.View.extend({ initialize(o) { @@ -58,7 +59,7 @@ export default Backbone.View.extend({ }, this); this.$el.append(fragment); - this.$el.attr('class', _.result(this, 'className')); + this.$el.attr('class', result(this, 'className')); return this; } }); diff --git a/src/panels/view/PanelView.js b/src/panels/view/PanelView.js index e6997ef20..255179abc 100644 --- a/src/panels/view/PanelView.js +++ b/src/panels/view/PanelView.js @@ -1,5 +1,5 @@ -var Backbone = require('backbone'); -var ButtonsView = require('./ButtonsView'); +import Backbone from 'backbone'; +import ButtonsView from './ButtonsView'; export default Backbone.View.extend({ initialize(o) { diff --git a/src/panels/view/PanelsView.js b/src/panels/view/PanelsView.js index 01f7b63fd..2bd973a25 100644 --- a/src/panels/view/PanelsView.js +++ b/src/panels/view/PanelsView.js @@ -1,5 +1,5 @@ -var Backbone = require('backbone'); -var PanelView = require('./PanelView'); +import Backbone from 'backbone'; +import PanelView from './PanelView'; export default Backbone.View.extend({ initialize(o) { diff --git a/src/parser/index.js b/src/parser/index.js index 25b5e7c38..a397f8a2e 100644 --- a/src/parser/index.js +++ b/src/parser/index.js @@ -1,8 +1,9 @@ +import defaults from './config/config'; +import parserCss from './model/ParserCss'; +import parserHtml from './model/ParserHtml'; + export default () => { - let conf = {}, - defaults = require('./config/config'), - parserCss = require('./model/ParserCss'), - parserHtml = require('./model/ParserHtml'); + let conf = {}; let pHtml, pCss; return { diff --git a/src/plugin_manager/index.js b/src/plugin_manager/index.js index 57f9b7d16..015e3c4f4 100644 --- a/src/plugin_manager/index.js +++ b/src/plugin_manager/index.js @@ -1,6 +1,7 @@ +import defaults from './config/config'; + export default config => { - var c = config || {}, - defaults = require('./config/config'); + var c = config || {}; // Set default options for (var name in defaults) { diff --git a/src/rich_text_editor/index.js b/src/rich_text_editor/index.js index da0e86220..da0215188 100644 --- a/src/rich_text_editor/index.js +++ b/src/rich_text_editor/index.js @@ -28,10 +28,10 @@ import RichTextEditor from './model/RichTextEditor'; import { on, off } from 'utils/mixins'; +import defaults from './config/config'; export default () => { let config = {}; - const defaults = require('./config/config'); let toolbar, actions, lastEl, globalRte; const hideToolbar = () => { diff --git a/src/selector_manager/index.js b/src/selector_manager/index.js index 2af6f7d1a..1b483274d 100644 --- a/src/selector_manager/index.js +++ b/src/selector_manager/index.js @@ -45,16 +45,16 @@ */ import { isString, isElement, isObject, isArray } from 'underscore'; +import defaults from './config/config'; +import Selector from './model/Selector'; +import Selectors from './model/Selectors'; +import ClassTagsView from './view/ClassTagsView'; const isId = str => isString(str) && str[0] == '#'; const isClass = str => isString(str) && str[0] == '.'; export default config => { - var c = config || {}, - defaults = require('./config/config'), - Selector = require('./model/Selector'), - Selectors = require('./model/Selectors'), - ClassTagsView = require('./view/ClassTagsView'); + var c = config || {}; var selectors, selectorTags; return { diff --git a/src/selector_manager/model/Selector.js b/src/selector_manager/model/Selector.js index 4e0f3d44e..2312b02f8 100644 --- a/src/selector_manager/model/Selector.js +++ b/src/selector_manager/model/Selector.js @@ -1,4 +1,4 @@ -var Backbone = require('backbone'); +import Backbone from 'backbone'; const TYPE_CLASS = 1; const TYPE_ID = 2; diff --git a/src/selector_manager/model/Selectors.js b/src/selector_manager/model/Selectors.js index 4d991a762..74160522e 100644 --- a/src/selector_manager/model/Selectors.js +++ b/src/selector_manager/model/Selectors.js @@ -1,7 +1,8 @@ import { filter } from 'underscore'; -const Selector = require('./Selector'); +import Backbone from 'backbone'; +import Selector from './Selector'; -export default require('backbone').Collection.extend({ +export default Backbone.Collection.extend({ model: Selector, modelId: attr => `${attr.name}_${attr.type || Selector.TYPE_CLASS}`, diff --git a/src/selector_manager/view/ClassTagView.js b/src/selector_manager/view/ClassTagView.js index d47a0fe15..12b16ecca 100644 --- a/src/selector_manager/view/ClassTagView.js +++ b/src/selector_manager/view/ClassTagView.js @@ -1,7 +1,9 @@ -const Selector = require('./../model/Selector'); +import Backbone from 'backbone'; +import Selector from './../model/Selector'; + const inputProp = 'contentEditable'; -export default require('backbone').View.extend({ +export default Backbone.View.extend({ template() { const pfx = this.pfx; const ppfx = this.ppfx; diff --git a/src/selector_manager/view/ClassTagsView.js b/src/selector_manager/view/ClassTagsView.js index 06626e485..3ca7b15bf 100644 --- a/src/selector_manager/view/ClassTagsView.js +++ b/src/selector_manager/view/ClassTagsView.js @@ -1,6 +1,6 @@ import { template, debounce } from 'underscore'; import Backbone from 'backbone'; -var ClassTagView = require('./ClassTagView'); +import ClassTagView from './ClassTagView'; export default Backbone.View.extend({ template: template(` diff --git a/src/storage_manager/index.js b/src/storage_manager/index.js index 3e75cb132..43b7a8e18 100644 --- a/src/storage_manager/index.js +++ b/src/storage_manager/index.js @@ -32,12 +32,12 @@ * @module StorageManager */ -export default () => { - var c = {}, - defaults = require('./config/config'), - LocalStorage = require('./model/LocalStorage'), - RemoteStorage = require('./model/RemoteStorage'); +import defaults from './config/config'; +import LocalStorage from './model/LocalStorage'; +import RemoteStorage from './model/RemoteStorage'; +export default () => { + var c = {}; let em; var storages = {}; var defaultStorages = {}; diff --git a/src/storage_manager/model/LocalStorage.js b/src/storage_manager/model/LocalStorage.js index 0bd78d820..627306df2 100644 --- a/src/storage_manager/model/LocalStorage.js +++ b/src/storage_manager/model/LocalStorage.js @@ -1,4 +1,4 @@ -var Backbone = require('backbone'); +import Backbone from 'backbone'; export default Backbone.Model.extend({ defaults: { diff --git a/src/storage_manager/model/RemoteStorage.js b/src/storage_manager/model/RemoteStorage.js index 4166b6477..0555628b0 100644 --- a/src/storage_manager/model/RemoteStorage.js +++ b/src/storage_manager/model/RemoteStorage.js @@ -1,7 +1,8 @@ +import Backbone from 'backbone'; import fetch from 'utils/fetch'; import { isUndefined, isFunction } from 'underscore'; -export default require('backbone').Model.extend({ +export default Backbone.Model.extend({ fetch, defaults: { diff --git a/src/style_manager/index.js b/src/style_manager/index.js index 54ba5de6f..7f940a484 100644 --- a/src/style_manager/index.js +++ b/src/style_manager/index.js @@ -34,13 +34,13 @@ */ import { isElement } from 'underscore'; +import defaults from './config/config'; +import Sectors from './model/Sectors'; +import Properties from './model/Properties'; +import SectorsView from './view/SectorsView'; export default () => { - var c = {}, - defaults = require('./config/config'), - Sectors = require('./model/Sectors'), - Properties = require('./model/Properties'), - SectorsView = require('./view/SectorsView'); + var c = {}; let properties; var sectors, SectView; diff --git a/src/style_manager/model/Layer.js b/src/style_manager/model/Layer.js index d0c716644..e156465b9 100644 --- a/src/style_manager/model/Layer.js +++ b/src/style_manager/model/Layer.js @@ -1,4 +1,5 @@ import Backbone from 'backbone'; +import Properties from './Properties'; export default Backbone.Model.extend({ defaults: { @@ -11,7 +12,6 @@ export default Backbone.Model.extend({ }, initialize() { - const Properties = require('./Properties'); const properties = this.get('properties'); var value = this.get('value'); this.set( diff --git a/src/style_manager/model/Layers.js b/src/style_manager/model/Layers.js index bccbb4ea0..2b7fe3cda 100644 --- a/src/style_manager/model/Layers.js +++ b/src/style_manager/model/Layers.js @@ -1,5 +1,5 @@ import Backbone from 'backbone'; -const Layer = require('./Layer'); +import Layer from './Layer'; export default Backbone.Collection.extend({ model: Layer, diff --git a/src/style_manager/model/Properties.js b/src/style_manager/model/Properties.js index 9ab753f97..a865439ec 100644 --- a/src/style_manager/model/Properties.js +++ b/src/style_manager/model/Properties.js @@ -1,133 +1,147 @@ +import Backbone from 'backbone'; import TypeableCollection from 'domain_abstract/model/TypeableCollection'; -const Property = require('./Property'); +import Property from './Property'; +import PropertyStack from './PropertyStack'; +import PropertyStackView from './../view/PropertyStackView'; +import PropertyComposite from './PropertyComposite'; +import PropertyCompositeView from './../view/PropertyCompositeView'; +import PropertyFileView from './../view/PropertyFileView'; +import PropertyColorView from './../view/PropertyColorView'; +import PropertySelect from './PropertySelect'; +import PropertySelectView from './../view/PropertySelectView'; +import PropertyRadio from './PropertyRadio'; +import PropertyRadioView from './../view/PropertyRadioView'; +import PropertySlider from './PropertySlider'; +import PropertySliderView from './../view/PropertySliderView'; +import PropertyInteger from './PropertyInteger'; +import PropertyIntegerView from './../view/PropertyIntegerView'; +import PropertyView from './../view/PropertyView'; -export default require('backbone') - .Collection.extend(TypeableCollection) - .extend({ - types: [ - { - id: 'stack', - model: require('./PropertyStack'), - view: require('./../view/PropertyStackView'), - isType(value) { - if (value && value.type == 'stack') { - return value; - } - } - }, - { - id: 'composite', - model: require('./PropertyComposite'), - view: require('./../view/PropertyCompositeView'), - isType(value) { - if (value && value.type == 'composite') { - return value; - } +export default Backbone.Collection.extend(TypeableCollection).extend({ + types: [ + { + id: 'stack', + model: PropertyStack, + view: PropertyStackView, + isType(value) { + if (value && value.type == 'stack') { + return value; } - }, - { - id: 'file', - model: Property, - view: require('./../view/PropertyFileView'), - isType(value) { - if (value && value.type == 'file') { - return value; - } + } + }, + { + id: 'composite', + model: PropertyComposite, + view: PropertyCompositeView, + isType(value) { + if (value && value.type == 'composite') { + return value; } - }, - { - id: 'color', - model: Property, - view: require('./../view/PropertyColorView'), - isType(value) { - if (value && value.type == 'color') { - return value; - } + } + }, + { + id: 'file', + model: Property, + view: PropertyFileView, + isType(value) { + if (value && value.type == 'file') { + return value; } - }, - { - id: 'select', - model: require('./PropertySelect').default, - view: require('./../view/PropertySelectView'), - isType(value) { - if (value && value.type == 'select') { - return value; - } + } + }, + { + id: 'color', + model: Property, + view: PropertyColorView, + isType(value) { + if (value && value.type == 'color') { + return value; } - }, - { - id: 'radio', - model: require('./PropertyRadio'), - view: require('./../view/PropertyRadioView'), - isType(value) { - if (value && value.type == 'radio') { - return value; - } + } + }, + { + id: 'select', + model: PropertySelect, + view: PropertySelectView, + isType(value) { + if (value && value.type == 'select') { + return value; } - }, - { - id: 'slider', - model: require('./PropertySlider'), - view: require('./../view/PropertySliderView'), - isType(value) { - if (value && value.type == 'slider') { - return value; - } + } + }, + { + id: 'radio', + model: PropertyRadio, + view: PropertyRadioView, + isType(value) { + if (value && value.type == 'radio') { + return value; } - }, - { - id: 'integer', - model: require('./PropertyInteger'), - view: require('./../view/PropertyIntegerView'), - isType(value) { - if (value && value.type == 'integer') { - return value; - } + } + }, + { + id: 'slider', + model: PropertySlider, + view: PropertySliderView, + isType(value) { + if (value && value.type == 'slider') { + return value; } - }, - { - id: 'base', - model: Property, - view: require('./../view/PropertyView'), - isType(value) { - value.type = 'base'; + } + }, + { + id: 'integer', + model: PropertyInteger, + view: PropertyIntegerView, + isType(value) { + if (value && value.type == 'integer') { return value; } } - ], - - deepClone() { - const collection = this.clone(); - collection.reset( - collection.map(model => { - const cloned = model.clone(); - cloned.typeView = model.typeView; - return cloned; - }) - ); - return collection; }, + { + id: 'base', + model: Property, + view: PropertyView, + isType(value) { + value.type = 'base'; + return value; + } + } + ], - /** - * Parse a value and return an array splitted by properties - * @param {string} value - * @return {Array} - * @return - */ - parseValue(value) { - const properties = []; - const values = value.split(' '); - values.forEach((value, i) => { - const property = this.at(i); - if (!property) return; - properties.push({ ...property.attributes, ...{ value } }); - }); - return properties; - }, + deepClone() { + const collection = this.clone(); + collection.reset( + collection.map(model => { + const cloned = model.clone(); + cloned.typeView = model.typeView; + return cloned; + }) + ); + return collection; + }, - getFullValue() { - let result = ''; - this.each(model => (result += `${model.getFullValue()} `)); - return result.trim(); - } - }); + /** + * Parse a value and return an array splitted by properties + * @param {string} value + * @return {Array} + * @return + */ + parseValue(value) { + const properties = []; + const values = value.split(' '); + values.forEach((value, i) => { + const property = this.at(i); + if (!property) return; + properties.push({ ...property.attributes, ...{ value } }); + }); + return properties; + }, + + getFullValue() { + let result = ''; + this.each(model => (result += `${model.getFullValue()} `)); + return result.trim(); + } +}); diff --git a/src/style_manager/model/Property.js b/src/style_manager/model/Property.js index b68005241..7eee21631 100644 --- a/src/style_manager/model/Property.js +++ b/src/style_manager/model/Property.js @@ -1,7 +1,8 @@ +import Backbone from 'backbone'; import { isUndefined, isString } from 'underscore'; import { capitalize } from 'utils/mixins'; -const Property = require('backbone').Model.extend( +const Property = Backbone.Model.extend( { defaults: { name: '', diff --git a/src/style_manager/model/PropertyComposite.js b/src/style_manager/model/PropertyComposite.js index 04f5db42d..4c2c007ef 100644 --- a/src/style_manager/model/PropertyComposite.js +++ b/src/style_manager/model/PropertyComposite.js @@ -1,4 +1,4 @@ -const Property = require('./Property'); +import Property from './Property'; export default Property.extend({ defaults: { @@ -24,7 +24,7 @@ export default Property.extend({ initialize(props = {}, opts = {}) { Property.callParentInit(Property, this, props, opts); const properties = this.get('properties') || []; - const Properties = require('./Properties'); + const Properties = require('./Properties').default; this.set('properties', new Properties(properties)); this.listenTo(this, 'change:value', this.updateValues); Property.callInit(this, props, opts); diff --git a/src/style_manager/model/PropertyFactory.js b/src/style_manager/model/PropertyFactory.js index 925a4bc65..07b2f4566 100644 --- a/src/style_manager/model/PropertyFactory.js +++ b/src/style_manager/model/PropertyFactory.js @@ -1,5 +1,3 @@ -var Backbone = require('backbone'); - export default () => ({ /** * Build props object by their name diff --git a/src/style_manager/model/PropertyInteger.js b/src/style_manager/model/PropertyInteger.js index 6c70ccdcd..ff16de43f 100644 --- a/src/style_manager/model/PropertyInteger.js +++ b/src/style_manager/model/PropertyInteger.js @@ -1,7 +1,6 @@ import { isUndefined } from 'underscore'; - -const Property = require('./Property'); -const InputNumber = require('domain_abstract/ui/InputNumber'); +import Property from './Property'; +import InputNumber from 'domain_abstract/ui/InputNumber'; export default Property.extend({ defaults: { diff --git a/src/style_manager/model/PropertyRadio.js b/src/style_manager/model/PropertyRadio.js index ef291fc8b..c99414229 100644 --- a/src/style_manager/model/PropertyRadio.js +++ b/src/style_manager/model/PropertyRadio.js @@ -1,4 +1,4 @@ -const Property = require('./Property'); +import Property from './Property'; export default Property.extend({ defaults: () => ({ diff --git a/src/style_manager/model/PropertySelect.js b/src/style_manager/model/PropertySelect.js index 6b821486e..33d9151c6 100644 --- a/src/style_manager/model/PropertySelect.js +++ b/src/style_manager/model/PropertySelect.js @@ -1,4 +1,4 @@ -const Property = require('./PropertyRadio'); +import Property from './PropertyRadio'; export default Property.extend({ defaults: () => ({ diff --git a/src/style_manager/model/PropertySlider.js b/src/style_manager/model/PropertySlider.js index 280ec8954..2b34537fd 100644 --- a/src/style_manager/model/PropertySlider.js +++ b/src/style_manager/model/PropertySlider.js @@ -1,4 +1,4 @@ -const Property = require('./PropertyInteger'); +import Property from './PropertyInteger'; export default Property.extend({ defaults: { diff --git a/src/style_manager/model/PropertyStack.js b/src/style_manager/model/PropertyStack.js index 61be1e2c8..e6930c73a 100644 --- a/src/style_manager/model/PropertyStack.js +++ b/src/style_manager/model/PropertyStack.js @@ -1,5 +1,5 @@ -const Property = require('./PropertyComposite'); -const Layers = require('./Layers'); +import Property from './PropertyComposite'; +import Layers from './Layers'; export default Property.extend({ defaults: { diff --git a/src/style_manager/model/Sector.js b/src/style_manager/model/Sector.js index 01a096ff6..442d57da6 100644 --- a/src/style_manager/model/Sector.js +++ b/src/style_manager/model/Sector.js @@ -1,8 +1,7 @@ +import Backbone from 'backbone'; import { extend } from 'underscore'; - -const Backbone = require('backbone'); -const Properties = require('./Properties'); -const PropertyFactory = require('./PropertyFactory'); +import Properties from './Properties'; +import PropertyFactory from './PropertyFactory'; export default Backbone.Model.extend({ defaults: { diff --git a/src/style_manager/model/Sectors.js b/src/style_manager/model/Sectors.js index 26cb0c64e..df38fe47e 100644 --- a/src/style_manager/model/Sectors.js +++ b/src/style_manager/model/Sectors.js @@ -1,5 +1,6 @@ -const Sector = require('./Sector'); +import Backbone from 'backbone'; +import Sector from './Sector'; -export default require('backbone').Collection.extend({ +export default Backbone.Collection.extend({ model: Sector }); diff --git a/src/style_manager/view/LayerView.js b/src/style_manager/view/LayerView.js index 20d30ae96..9f0ca61f0 100644 --- a/src/style_manager/view/LayerView.js +++ b/src/style_manager/view/LayerView.js @@ -1,4 +1,5 @@ import Backbone from 'backbone'; +import PropertiesView from './PropertiesView'; export default Backbone.View.extend({ events: { @@ -146,7 +147,6 @@ export default Backbone.View.extend({ }, render() { - const PropertiesView = require('./PropertiesView'); const propsConfig = this.propsConfig; const { model, el, pfx } = this; const preview = model.get('preview'); diff --git a/src/style_manager/view/LayersView.js b/src/style_manager/view/LayersView.js index ab1e510ed..b499ea31e 100644 --- a/src/style_manager/view/LayersView.js +++ b/src/style_manager/view/LayersView.js @@ -1,5 +1,5 @@ -var Backbone = require('backbone'); -var LayerView = require('./LayerView'); +import Backbone from 'backbone'; +import LayerView from './LayerView'; export default Backbone.View.extend({ initialize(o) { diff --git a/src/style_manager/view/PropertiesView.js b/src/style_manager/view/PropertiesView.js index 17e470b72..cc46538ac 100644 --- a/src/style_manager/view/PropertiesView.js +++ b/src/style_manager/view/PropertiesView.js @@ -1,12 +1,4 @@ import Backbone from 'backbone'; -const PropertyView = require('./PropertyView'); -const PropertyIntegerView = require('./PropertyIntegerView'); -const PropertyRadioView = require('./PropertyRadioView'); -const PropertySelectView = require('./PropertySelectView'); -const PropertyColorView = require('./PropertyColorView'); -const PropertyFileView = require('./PropertyFileView'); -const PropertyCompositeView = require('./PropertyCompositeView'); -const PropertyStackView = require('./PropertyStackView'); export default Backbone.View.extend({ initialize(o) { diff --git a/src/style_manager/view/PropertyColorView.js b/src/style_manager/view/PropertyColorView.js index ffc6d8dde..ba5a31749 100644 --- a/src/style_manager/view/PropertyColorView.js +++ b/src/style_manager/view/PropertyColorView.js @@ -1,6 +1,7 @@ -const InputColor = require('domain_abstract/ui/InputColor'); +import PropertyIntegerView from './PropertyIntegerView'; +import InputColor from 'domain_abstract/ui/InputColor'; -export default require('./PropertyIntegerView').extend({ +export default PropertyIntegerView.extend({ setValue(value, opts = {}) { opts = { ...opts, silent: 1 }; this.inputInst.setValue(value, opts); diff --git a/src/style_manager/view/PropertyCompositeView.js b/src/style_manager/view/PropertyCompositeView.js index 4338abf6c..da7f60e52 100644 --- a/src/style_manager/view/PropertyCompositeView.js +++ b/src/style_manager/view/PropertyCompositeView.js @@ -1,5 +1,6 @@ import Backbone from 'backbone'; -const PropertyView = require('./PropertyView'); +import PropertyView from './PropertyView'; + const $ = Backbone.$; export default PropertyView.extend({ @@ -55,7 +56,7 @@ export default PropertyView.extend({ prop.parent = model; }, this); - var PropertiesView = require('./PropertiesView'); + var PropertiesView = require('./PropertiesView').default; var propsView = new PropertiesView(this.getPropsConfig()); this.$props = propsView.render().$el; this.properties = propsView.properties; diff --git a/src/style_manager/view/PropertyFileView.js b/src/style_manager/view/PropertyFileView.js index 309501165..a5b3bc6dd 100644 --- a/src/style_manager/view/PropertyFileView.js +++ b/src/style_manager/view/PropertyFileView.js @@ -1,6 +1,7 @@ import { isString } from 'underscore'; import Backbone from 'backbone'; -const PropertyView = require('./PropertyView'); +import PropertyView from './PropertyView'; + const $ = Backbone.$; export default PropertyView.extend({ diff --git a/src/style_manager/view/PropertyIntegerView.js b/src/style_manager/view/PropertyIntegerView.js index ce4043056..1038be526 100644 --- a/src/style_manager/view/PropertyIntegerView.js +++ b/src/style_manager/view/PropertyIntegerView.js @@ -1,8 +1,7 @@ import Backbone from 'backbone'; -const InputNumber = require('domain_abstract/ui/InputNumber'); -const PropertyView = require('./PropertyView'); +import PropertyView from './PropertyView'; + const $ = Backbone.$; -let timeout; export default PropertyView.extend({ templateInput() { diff --git a/src/style_manager/view/PropertyRadioView.js b/src/style_manager/view/PropertyRadioView.js index c1335516e..19584330a 100644 --- a/src/style_manager/view/PropertyRadioView.js +++ b/src/style_manager/view/PropertyRadioView.js @@ -1,4 +1,6 @@ -export default require('./PropertyView').extend({ +import PropertyView from './PropertyView'; + +export default PropertyView.extend({ templateInput() { const pfx = this.pfx; const ppfx = this.ppfx; diff --git a/src/style_manager/view/PropertySelectView.js b/src/style_manager/view/PropertySelectView.js index 16e85609c..001c86816 100644 --- a/src/style_manager/view/PropertySelectView.js +++ b/src/style_manager/view/PropertySelectView.js @@ -1,5 +1,6 @@ import Backbone from 'backbone'; -const PropertyView = require('./PropertyView'); +import PropertyView from './PropertyView'; + const $ = Backbone.$; export default PropertyView.extend({ diff --git a/src/style_manager/view/PropertySliderView.js b/src/style_manager/view/PropertySliderView.js index ed35992e3..0c090638e 100644 --- a/src/style_manager/view/PropertySliderView.js +++ b/src/style_manager/view/PropertySliderView.js @@ -1,4 +1,4 @@ -const Property = require('./PropertyIntegerView'); +import Property from './PropertyIntegerView'; export default Property.extend({ events() { diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js index 8e9bc0fa4..e642c5474 100644 --- a/src/style_manager/view/PropertyStackView.js +++ b/src/style_manager/view/PropertyStackView.js @@ -1,5 +1,5 @@ -const PropertyCompositeView = require('./PropertyCompositeView'); -const LayersView = require('./LayersView'); +import PropertyCompositeView from './PropertyCompositeView'; +import LayersView from './LayersView'; export default PropertyCompositeView.extend({ templateInput() { @@ -139,7 +139,7 @@ export default PropertyCompositeView.extend({ const self = this; const model = this.model; const fieldEl = this.el.querySelector('[data-layers-wrapper]'); - const PropertiesView = require('./PropertiesView'); + const PropertiesView = require('./PropertiesView').default; const propsConfig = { target: this.target, propTarget: this.propTarget, diff --git a/src/style_manager/view/SectorView.js b/src/style_manager/view/SectorView.js index 8512cbb5a..34ed34854 100644 --- a/src/style_manager/view/SectorView.js +++ b/src/style_manager/view/SectorView.js @@ -1,9 +1,9 @@ -import _ from 'underscore'; import Backbone from 'backbone'; -var PropertiesView = require('./PropertiesView'); +import { template } from 'underscore'; +import PropertiesView from './PropertiesView'; export default Backbone.View.extend({ - template: _.template(` + template: template(`
<%= label %> diff --git a/src/style_manager/view/SectorsView.js b/src/style_manager/view/SectorsView.js index e1c7a31c2..000497f45 100644 --- a/src/style_manager/view/SectorsView.js +++ b/src/style_manager/view/SectorsView.js @@ -1,8 +1,7 @@ import Backbone from 'backbone'; import { extend, isString } from 'underscore'; import { isTaggableNode } from 'utils/mixins'; - -const SectorView = require('./SectorView'); +import SectorView from './SectorView'; export default Backbone.View.extend({ initialize(o = {}) { diff --git a/src/trait_manager/index.js b/src/trait_manager/index.js index 5fa76cf1f..d7acbe89f 100644 --- a/src/trait_manager/index.js +++ b/src/trait_manager/index.js @@ -1,7 +1,6 @@ import { defaults, isElement } from 'underscore'; - -const defaultOpts = require('./config/config'); -const TraitsView = require('./view/TraitsView'); +import defaultOpts from './config/config'; +import TraitsView from './view/TraitsView'; export default () => { let c = {}; diff --git a/src/trait_manager/model/Trait.js b/src/trait_manager/model/Trait.js index 32df78cb7..404eb27d0 100644 --- a/src/trait_manager/model/Trait.js +++ b/src/trait_manager/model/Trait.js @@ -1,6 +1,7 @@ +import Backbone from 'backbone'; import { isUndefined } from 'underscore'; -export default require('backbone').Model.extend({ +export default Backbone.Model.extend({ defaults: { type: 'text', // text, number, range, select label: '', diff --git a/src/trait_manager/model/Traits.js b/src/trait_manager/model/Traits.js index 6e704feb9..3101dab53 100644 --- a/src/trait_manager/model/Traits.js +++ b/src/trait_manager/model/Traits.js @@ -1,7 +1,7 @@ +import Backbone from 'backbone'; import { isString, isArray } from 'underscore'; -const Backbone = require('backbone'); -const Trait = require('./Trait'); -const TraitFactory = require('./TraitFactory'); +import Trait from './Trait'; +import TraitFactory from './TraitFactory'; export default Backbone.Collection.extend({ model: Trait, diff --git a/src/trait_manager/view/TraitButtonView.js b/src/trait_manager/view/TraitButtonView.js index e64cf00a0..331f09b53 100644 --- a/src/trait_manager/view/TraitButtonView.js +++ b/src/trait_manager/view/TraitButtonView.js @@ -1,5 +1,5 @@ -import { isString, isObject } from 'underscore'; -const TraitView = require('./TraitView'); +import { isString } from 'underscore'; +import TraitView from './TraitView'; export default TraitView.extend({ events: { diff --git a/src/trait_manager/view/TraitCheckboxView.js b/src/trait_manager/view/TraitCheckboxView.js index 02d403b6f..a98bf6a04 100644 --- a/src/trait_manager/view/TraitCheckboxView.js +++ b/src/trait_manager/view/TraitCheckboxView.js @@ -1,5 +1,5 @@ import { isUndefined } from 'underscore'; -var TraitView = require('./TraitView'); +import TraitView from './TraitView'; export default TraitView.extend({ initialize(o) { diff --git a/src/trait_manager/view/TraitColorView.js b/src/trait_manager/view/TraitColorView.js index 85908d68b..09568c724 100644 --- a/src/trait_manager/view/TraitColorView.js +++ b/src/trait_manager/view/TraitColorView.js @@ -1,5 +1,5 @@ -var TraitView = require('./TraitView'); -var InputColor = require('domain_abstract/ui/InputColor'); +import TraitView from './TraitView'; +import InputColor from 'domain_abstract/ui/InputColor'; export default TraitView.extend({ /** diff --git a/src/trait_manager/view/TraitNumberView.js b/src/trait_manager/view/TraitNumberView.js index 335ab87f0..86a6c1eec 100644 --- a/src/trait_manager/view/TraitNumberView.js +++ b/src/trait_manager/view/TraitNumberView.js @@ -1,5 +1,5 @@ -var TraitView = require('./TraitView'); -var InputNumber = require('domain_abstract/ui/InputNumber'); +import TraitView from './TraitView'; +import InputNumber from 'domain_abstract/ui/InputNumber'; export default TraitView.extend({ getValueForTarget() { diff --git a/src/trait_manager/view/TraitSelectView.js b/src/trait_manager/view/TraitSelectView.js index 9a34489c5..f1c994823 100644 --- a/src/trait_manager/view/TraitSelectView.js +++ b/src/trait_manager/view/TraitSelectView.js @@ -1,6 +1,8 @@ +import Backbone from 'backbone'; import { isString, isUndefined } from 'underscore'; -const TraitView = require('./TraitView'); -const $ = require('backbone').$; +import TraitView from './TraitView'; + +const $ = Backbone.$; export default TraitView.extend({ initialize(o) { diff --git a/src/trait_manager/view/TraitView.js b/src/trait_manager/view/TraitView.js index 59a5bcef9..eea0fc02d 100644 --- a/src/trait_manager/view/TraitView.js +++ b/src/trait_manager/view/TraitView.js @@ -1,6 +1,6 @@ -import { isUndefined, clone } from 'underscore'; +import Backbone from 'backbone'; +import { isUndefined } from 'underscore'; -const Backbone = require('backbone'); const $ = Backbone.$; export default Backbone.View.extend({ diff --git a/src/trait_manager/view/TraitsView.js b/src/trait_manager/view/TraitsView.js index 80b71e1e4..d6777998d 100644 --- a/src/trait_manager/view/TraitsView.js +++ b/src/trait_manager/view/TraitsView.js @@ -1,10 +1,10 @@ -const DomainViews = require('domain_abstract/view/DomainViews'); -const TraitView = require('./TraitView'); -const TraitSelectView = require('./TraitSelectView'); -const TraitCheckboxView = require('./TraitCheckboxView'); -const TraitNumberView = require('./TraitNumberView'); -const TraitColorView = require('./TraitColorView'); -const TraitButtonView = require('./TraitButtonView'); +import DomainViews from 'domain_abstract/view/DomainViews'; +import TraitView from './TraitView'; +import TraitSelectView from './TraitSelectView'; +import TraitCheckboxView from './TraitCheckboxView'; +import TraitNumberView from './TraitNumberView'; +import TraitColorView from './TraitColorView'; +import TraitButtonView from './TraitButtonView'; export default DomainViews.extend({ itemView: TraitView, diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js index 07e278c5e..ca553dcfc 100644 --- a/src/utils/Sorter.js +++ b/src/utils/Sorter.js @@ -1,5 +1,12 @@ import Backbone from 'backbone'; -import { isString, isFunction, isArray, result, each } from 'underscore'; +import { + isString, + isFunction, + isArray, + result, + each, + bindAll +} from 'underscore'; import { on, off, @@ -14,7 +21,7 @@ const $ = Backbone.$; export default Backbone.View.extend({ initialize(opt) { this.opt = opt || {}; - _.bindAll( + bindAll( this, 'startSort', 'onMove', diff --git a/src/utils/index.js b/src/utils/index.js index 2083a05c1..70fa5b9e2 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,9 +1,8 @@ import Dragger from './Dragger'; +import Sorter from './Sorter'; +import Resizer from './Resizer'; export default () => { - const Sorter = require('./Sorter'); - const Resizer = require('./Resizer'); - return { /** * Name of the module diff --git a/src/utils/mixins.js b/src/utils/mixins.js index d6341c938..6ee63b59d 100644 --- a/src/utils/mixins.js +++ b/src/utils/mixins.js @@ -1,4 +1,4 @@ -import { omit, keys, isUndefined, isElement } from 'underscore'; +import { keys, isUndefined, isElement } from 'underscore'; const elProt = window.Element.prototype; const matches =