From 5e926b61f4ca74bd10cde48dcf64ace49556debd Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Wed, 31 May 2017 18:46:11 +0200 Subject: [PATCH] Updates for the strict mode --- index.html | 2 + src/asset_manager/model/Asset.js | 9 +-- src/asset_manager/model/AssetImage.js | 10 ++-- src/asset_manager/model/Assets.js | 11 ++-- src/asset_manager/view/AssetImageView.js | 10 ++-- src/asset_manager/view/AssetView.js | 8 ++- src/asset_manager/view/AssetsView.js | 13 +++-- src/asset_manager/view/FileUploader.js | 10 ++-- src/block_manager/model/Block.js | 9 +-- src/block_manager/model/Blocks.js | 10 ++-- src/block_manager/view/BlockView.js | 9 +-- src/block_manager/view/BlocksView.js | 10 ++-- src/canvas/model/Canvas.js | 10 ++-- src/canvas/model/Frame.js | 9 +-- src/canvas/view/CanvasView.js | 10 ++-- src/canvas/view/FrameView.js | 9 +-- src/code_manager/model/CodeMirrorEditor.js | 18 +++--- src/code_manager/model/CssGenerator.js | 9 +-- src/code_manager/model/HtmlGenerator.js | 9 +-- src/code_manager/model/JsGenerator.js | 8 ++- src/code_manager/model/JsonGenerator.js | 9 +-- src/code_manager/view/EditorView.js | 10 ++-- src/commands/model/Command.js | 9 +-- src/commands/model/Commands.js | 10 ++-- src/commands/view/CommandAbstract.js | 7 ++- src/commands/view/CreateComponent.js | 8 ++- src/commands/view/DeleteComponent.js | 8 ++- src/commands/view/ImageComponent.js | 8 ++- src/commands/view/InsertCustom.js | 8 ++- src/commands/view/MoveComponent.js | 11 ++-- src/commands/view/OpenLayers.js | 8 ++- src/commands/view/OpenStyleManager.js | 8 ++- src/commands/view/SelectComponent.js | 1 + src/commands/view/TextComponent.js | 8 ++- src/css_composer/model/CssRule.js | 10 ++-- src/css_composer/model/CssRules.js | 10 ++-- src/css_composer/model/Selectors.js | 7 ++- src/css_composer/view/CssRuleView.js | 11 ++-- src/css_composer/view/CssRulesView.js | 10 ++-- src/device_manager/model/Device.js | 9 +-- src/device_manager/model/Devices.js | 10 ++-- src/device_manager/view/DevicesView.js | 8 ++- src/dom_components/model/Component.js | 12 ++-- src/dom_components/model/ComponentImage.js | 9 +-- src/dom_components/model/ComponentLink.js | 9 +-- src/dom_components/model/ComponentMap.js | 10 ++-- src/dom_components/model/ComponentScript.js | 9 +-- src/dom_components/model/ComponentTable.js | 9 +-- .../model/ComponentTableCell.js | 9 +-- src/dom_components/model/ComponentTableRow.js | 9 +-- src/dom_components/model/ComponentText.js | 9 +-- src/dom_components/model/ComponentTextNode.js | 9 +-- src/dom_components/model/ComponentVideo.js | 10 ++-- src/dom_components/model/Components.js | 7 ++- src/dom_components/model/Toolbar.js | 10 ++-- src/dom_components/model/ToolbarButton.js | 9 +-- src/dom_components/view/ComponentImageView.js | 10 ++-- src/dom_components/view/ComponentLinkView.js | 11 ++-- src/dom_components/view/ComponentMapView.js | 10 ++-- .../view/ComponentScriptView.js | 10 ++-- .../view/ComponentTableCellView.js | 10 ++-- .../view/ComponentTableRowView.js | 10 ++-- src/dom_components/view/ComponentTableView.js | 10 ++-- .../view/ComponentTextNodeView.js | 9 +-- src/dom_components/view/ComponentTextView.js | 10 ++-- src/dom_components/view/ComponentVideoView.js | 10 ++-- src/dom_components/view/ComponentView.js | 10 ++-- src/dom_components/view/ComponentsView.js | 7 ++- src/dom_components/view/ToolbarButtonView.js | 9 +-- src/dom_components/view/ToolbarView.js | 11 ++-- src/domain_abstract/ui/Input.js | 10 ++-- src/domain_abstract/ui/InputColor.js | 12 ++-- src/domain_abstract/ui/InputNumber.js | 10 ++-- src/domain_abstract/view/DomainViews.js | 9 +-- src/editor/model/Editor.js | 56 +++++++++++++++---- src/editor/view/EditorView.js | 9 +-- src/modal_dialog/model/Modal.js | 8 ++- src/modal_dialog/view/ModalView.js | 10 ++-- src/navigator/view/ItemView.js | 9 ++- src/navigator/view/ItemsView.js | 10 ++-- src/panels/model/Button.js | 7 ++- src/panels/model/Buttons.js | 10 ++-- src/panels/model/Panel.js | 10 ++-- src/panels/model/Panels.js | 10 ++-- src/panels/view/ButtonView.js | 7 ++- src/panels/view/ButtonsView.js | 10 ++-- src/panels/view/PanelView.js | 8 ++- src/panels/view/PanelsView.js | 10 ++-- src/rich_text_editor/model/CommandButton.js | 9 +-- src/rich_text_editor/model/CommandButtons.js | 10 ++-- .../view/CommandButtonSelectView.js | 10 ++-- .../view/CommandButtonView.js | 9 +-- .../view/CommandButtonsView.js | 11 ++-- src/rich_text_editor/view/TextEditorView.js | 10 ++-- src/selector_manager/model/Selector.js | 9 +-- src/selector_manager/model/Selectors.js | 10 ++-- src/selector_manager/view/ClassTagView.js | 10 ++-- src/selector_manager/view/ClassTagsView.js | 11 ++-- src/storage_manager/model/LocalStorage.js | 9 +-- src/storage_manager/model/RemoteStorage.js | 9 +-- src/style_manager/model/Layer.js | 9 +-- src/style_manager/model/Layers.js | 10 ++-- src/style_manager/model/Properties.js | 10 ++-- src/style_manager/model/Property.js | 8 ++- src/style_manager/model/PropertyFactory.js | 9 +-- src/style_manager/model/Sector.js | 11 ++-- src/style_manager/model/Sectors.js | 10 ++-- src/style_manager/view/LayerView.js | 10 ++-- src/style_manager/view/LayersView.js | 10 ++-- src/style_manager/view/PropertiesView.js | 19 +++++-- src/style_manager/view/PropertyColorView.js | 11 ++-- .../view/PropertyCompositeView.js | 11 ++-- src/style_manager/view/PropertyFileView.js | 11 ++-- src/style_manager/view/PropertyIntegerView.js | 11 ++-- src/style_manager/view/PropertyRadioView.js | 11 ++-- src/style_manager/view/PropertySelectView.js | 11 ++-- src/style_manager/view/PropertyStackView.js | 13 +++-- src/style_manager/view/PropertyView.js | 11 ++-- src/style_manager/view/SectorView.js | 11 ++-- src/style_manager/view/SectorsView.js | 10 ++-- src/trait_manager/model/Trait.js | 9 +-- src/trait_manager/model/TraitFactory.js | 9 +-- src/trait_manager/model/Traits.js | 11 ++-- src/trait_manager/view/TraitCheckboxView.js | 9 +-- src/trait_manager/view/TraitColorView.js | 10 ++-- src/trait_manager/view/TraitNumberView.js | 10 ++-- src/trait_manager/view/TraitSelectView.js | 10 ++-- src/trait_manager/view/TraitView.js | 8 ++- webpack.config.js | 6 ++ 129 files changed, 781 insertions(+), 498 deletions(-) diff --git a/index.html b/index.html index 67caa90b6..b0b9c397c 100755 --- a/index.html +++ b/index.html @@ -1146,6 +1146,8 @@ }); + + editor.render(); diff --git a/src/asset_manager/model/Asset.js b/src/asset_manager/model/Asset.js index d4e51c5d6..539508a66 100644 --- a/src/asset_manager/model/Asset.js +++ b/src/asset_manager/model/Asset.js @@ -1,6 +1,7 @@ -define(['backbone'], - function (Backbone) { - return Backbone.Model.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + module.exports = Backbone.Model.extend({ idAttribute: 'src', @@ -28,4 +29,4 @@ define(['backbone'], }, }); -}); +}); \ No newline at end of file diff --git a/src/asset_manager/model/AssetImage.js b/src/asset_manager/model/AssetImage.js index 1c99f3d8d..273d683c8 100644 --- a/src/asset_manager/model/AssetImage.js +++ b/src/asset_manager/model/AssetImage.js @@ -1,6 +1,8 @@ -define(['backbone', './Asset'], - function (Backbone, Asset) { - return Asset.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Asset = require('./Asset'); + module.exports = Asset.extend({ defaults: _.extend({}, Asset.prototype.defaults, { type: 'image', @@ -10,4 +12,4 @@ define(['backbone', './Asset'], }), }); -}); +}); \ No newline at end of file diff --git a/src/asset_manager/model/Assets.js b/src/asset_manager/model/Assets.js index 189dbd8a0..9d736945e 100644 --- a/src/asset_manager/model/Assets.js +++ b/src/asset_manager/model/Assets.js @@ -1,6 +1,9 @@ -define(['backbone', './Asset', './AssetImage'], - function (Backbone, Asset, AssetImage) { - return Backbone.Collection.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Asset = require('./Asset'); + var AssetImage = require('./AssetImage'); + module.exports = Backbone.Collection.extend({ model: AssetImage, @@ -64,4 +67,4 @@ define(['backbone', './Asset', './AssetImage'], }); -}); +}); \ No newline at end of file diff --git a/src/asset_manager/view/AssetImageView.js b/src/asset_manager/view/AssetImageView.js index 7f9295065..e1052a85c 100644 --- a/src/asset_manager/view/AssetImageView.js +++ b/src/asset_manager/view/AssetImageView.js @@ -1,6 +1,8 @@ -define(['./AssetView','text!./../template/assetImage.html'], - function (AssetView, assetTemplate) { - return AssetView.extend({ +define(function(require, exports, module){ + 'use strict'; + var AssetView = require('./AssetView'); + var assetTemplate = require('text!./../template/assetImage.html'); + module.exports = AssetView.extend({ events:{ 'click': 'handleClick', @@ -94,4 +96,4 @@ define(['./AssetView','text!./../template/assetImage.html'], return this; }, }); -}); +}); \ No newline at end of file diff --git a/src/asset_manager/view/AssetView.js b/src/asset_manager/view/AssetView.js index 23e1fbdd7..7bd5a11d5 100644 --- a/src/asset_manager/view/AssetView.js +++ b/src/asset_manager/view/AssetView.js @@ -1,6 +1,8 @@ -define(['backbone'], function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(o) { this.options = o; this.config = o.config || {}; @@ -11,4 +13,4 @@ define(['backbone'], function (Backbone) { }, }); -}); +}); \ No newline at end of file diff --git a/src/asset_manager/view/AssetsView.js b/src/asset_manager/view/AssetsView.js index 9d60b1406..855309ab8 100644 --- a/src/asset_manager/view/AssetsView.js +++ b/src/asset_manager/view/AssetsView.js @@ -1,6 +1,11 @@ -define(['backbone', './AssetView', './AssetImageView', './FileUploader', 'text!./../template/assets.html'], - function (Backbone, AssetView, AssetImageView, FileUploader, assetsTemplate) { - return Backbone.View.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var AssetView = require('./AssetView'); + var AssetImageView = require('./AssetImageView'); + var FileUploader = require('./FileUploader'); + var assetsTemplate = require('text!./../template/assets.html'); + module.exports = Backbone.View.extend({ template: _.template(assetsTemplate), @@ -128,4 +133,4 @@ define(['backbone', './AssetView', './AssetImageView', './FileUploader', 'text!. return this; } }); -}); +}); \ No newline at end of file diff --git a/src/asset_manager/view/FileUploader.js b/src/asset_manager/view/FileUploader.js index d269f96c4..4c6c3ab9f 100644 --- a/src/asset_manager/view/FileUploader.js +++ b/src/asset_manager/view/FileUploader.js @@ -1,6 +1,8 @@ -define(['backbone', 'text!./../template/fileUploader.html'], - function (Backbone, fileUploaderTemplate) { - return Backbone.View.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var fileUploaderTemplate = require('text!./../template/fileUploader.html'); + module.exports = Backbone.View.extend({ template: _.template(fileUploaderTemplate), @@ -94,4 +96,4 @@ define(['backbone', 'text!./../template/fileUploader.html'], }, }); -}); +}); \ No newline at end of file diff --git a/src/block_manager/model/Block.js b/src/block_manager/model/Block.js index 8eebc16ec..29aeb9fde 100644 --- a/src/block_manager/model/Block.js +++ b/src/block_manager/model/Block.js @@ -1,7 +1,8 @@ -define(['backbone'], - function(Backbone){ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults :{ label: '', @@ -10,4 +11,4 @@ define(['backbone'], }, }); - }); + }); \ No newline at end of file diff --git a/src/block_manager/model/Blocks.js b/src/block_manager/model/Blocks.js index f2715857b..377339187 100644 --- a/src/block_manager/model/Blocks.js +++ b/src/block_manager/model/Blocks.js @@ -1,9 +1,11 @@ -define(['backbone','./Block'], - function (Backbone, Block) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Block = require('./Block'); - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ model: Block, }); -}); +}); \ No newline at end of file diff --git a/src/block_manager/view/BlockView.js b/src/block_manager/view/BlockView.js index 223f325b9..ab26809e4 100644 --- a/src/block_manager/view/BlockView.js +++ b/src/block_manager/view/BlockView.js @@ -1,7 +1,8 @@ -define(['backbone'], -function(Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ events: { mousedown: 'onDrag' @@ -47,4 +48,4 @@ function(Backbone) { }, }); -}); +}); \ No newline at end of file diff --git a/src/block_manager/view/BlocksView.js b/src/block_manager/view/BlocksView.js index 03324099d..44946e3e0 100644 --- a/src/block_manager/view/BlocksView.js +++ b/src/block_manager/view/BlocksView.js @@ -1,7 +1,9 @@ -define(['backbone', './BlockView'], -function(Backbone, BlockView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var BlockView = require('./BlockView'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(opts, config) { _.bindAll(this, 'getSorter', 'onDrag', 'onDrop'); @@ -118,4 +120,4 @@ function(Backbone, BlockView) { }, }); -}); +}); \ No newline at end of file diff --git a/src/canvas/model/Canvas.js b/src/canvas/model/Canvas.js index 9ca966b80..e9d762553 100644 --- a/src/canvas/model/Canvas.js +++ b/src/canvas/model/Canvas.js @@ -1,7 +1,9 @@ -define(['backbone', './Frame'], - function(Backbone, Frame){ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Frame = require('./Frame'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults :{ frame: '', @@ -15,4 +17,4 @@ define(['backbone', './Frame'], }, }); - }); + }); \ No newline at end of file diff --git a/src/canvas/model/Frame.js b/src/canvas/model/Frame.js index cc89f8c4d..bef54f0dd 100644 --- a/src/canvas/model/Frame.js +++ b/src/canvas/model/Frame.js @@ -1,7 +1,8 @@ -define(['backbone'], - function(Backbone){ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults :{ wrapper: '', @@ -11,4 +12,4 @@ define(['backbone'], }, }); - }); + }); \ No newline at end of file diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js index cff06f2c1..0916680eb 100644 --- a/src/canvas/view/CanvasView.js +++ b/src/canvas/view/CanvasView.js @@ -1,9 +1,11 @@ -define(['backbone','./FrameView'], -function(Backbone, FrameView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var FrameView = require('./FrameView'); /** * @class CanvasView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(o) { _.bindAll(this, 'renderBody', 'onFrameScroll', 'clearOff'); @@ -235,7 +237,7 @@ function(Backbone, FrameView) { } } var ppfx = this.ppfx; - toolsEl = $('
', { id: ppfx + 'tools' }).get(0); + var toolsEl = $('
', { id: ppfx + 'tools' }).get(0); this.hlEl = $('
', { class: ppfx + 'highlighter' }).get(0); this.badgeEl = $('
', {class: ppfx + 'badge'}).get(0); this.placerEl = $('
', {class: ppfx + 'placeholder'}).get(0); diff --git a/src/canvas/view/FrameView.js b/src/canvas/view/FrameView.js index 3ab671a7f..616b7be32 100644 --- a/src/canvas/view/FrameView.js +++ b/src/canvas/view/FrameView.js @@ -1,9 +1,10 @@ -define(['backbone'], -function(Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); /** * @class CanvasView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ tagName: 'iframe', @@ -52,4 +53,4 @@ function(Backbone) { }, }); -}); +}); \ No newline at end of file diff --git a/src/code_manager/model/CodeMirrorEditor.js b/src/code_manager/model/CodeMirrorEditor.js index 2ac5c9d33..79158d305 100644 --- a/src/code_manager/model/CodeMirrorEditor.js +++ b/src/code_manager/model/CodeMirrorEditor.js @@ -1,14 +1,14 @@ -define(['backbone', - 'codemirror/lib/codemirror', - 'codemirror/mode/htmlmixed/htmlmixed', - 'codemirror/mode/css/css', - 'formatting' - ], - function(Backbone, CodeMirror, htmlMode, cssMode, formatting) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var CodeMirror = require('codemirror/lib/codemirror'); + var htmlMode = require('codemirror/mode/htmlmixed/htmlmixed'); + var cssMode = require('codemirror/mode/css/css'); + var formatting = require('formatting'); /** * @class CodeViewer * */ - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults: { input : '', @@ -48,4 +48,4 @@ define(['backbone', }, }); - }); + }); \ No newline at end of file diff --git a/src/code_manager/model/CssGenerator.js b/src/code_manager/model/CssGenerator.js index 1768c819b..0f229d38a 100644 --- a/src/code_manager/model/CssGenerator.js +++ b/src/code_manager/model/CssGenerator.js @@ -1,9 +1,10 @@ -define(['backbone'], - function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); /** * @class CssGenerator * */ - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ initialize: function() { this.compCls = []; @@ -148,4 +149,4 @@ define(['backbone'], }, }); -}); +}); \ No newline at end of file diff --git a/src/code_manager/model/HtmlGenerator.js b/src/code_manager/model/HtmlGenerator.js index 45fc56dd0..70e4cbc4b 100644 --- a/src/code_manager/model/HtmlGenerator.js +++ b/src/code_manager/model/HtmlGenerator.js @@ -1,9 +1,10 @@ -define(['backbone'], - function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); /** * @class HtmlGenerator * */ - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ /** @inheritdoc */ build: function(model, cssc){ @@ -20,4 +21,4 @@ define(['backbone'], }, }); -}); +}); \ No newline at end of file diff --git a/src/code_manager/model/JsGenerator.js b/src/code_manager/model/JsGenerator.js index addd91d02..ef2921be9 100644 --- a/src/code_manager/model/JsGenerator.js +++ b/src/code_manager/model/JsGenerator.js @@ -1,6 +1,8 @@ -define(['backbone'], function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ mapModel: function (model) { var code = ''; @@ -59,4 +61,4 @@ define(['backbone'], function (Backbone) { }, }); -}); +}); \ No newline at end of file diff --git a/src/code_manager/model/JsonGenerator.js b/src/code_manager/model/JsonGenerator.js index a1825ffcc..df4cff3f6 100644 --- a/src/code_manager/model/JsonGenerator.js +++ b/src/code_manager/model/JsonGenerator.js @@ -1,9 +1,10 @@ -define(['backbone'], - function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); /** * @class JsonGenerator * */ - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ /** @inheritdoc */ build: function(model) { @@ -37,4 +38,4 @@ define(['backbone'], } }); -}); +}); \ No newline at end of file diff --git a/src/code_manager/view/EditorView.js b/src/code_manager/view/EditorView.js index 5c010d015..37ef003ac 100644 --- a/src/code_manager/view/EditorView.js +++ b/src/code_manager/view/EditorView.js @@ -1,9 +1,11 @@ -define(['backbone', 'text!./../template/editor.html'], - function (Backbone, vTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var vTemplate = require('text!./../template/editor.html'); /** * @class EditorView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ template: _.template(vTemplate), @@ -22,4 +24,4 @@ define(['backbone', 'text!./../template/editor.html'], }, }); -}); +}); \ No newline at end of file diff --git a/src/commands/model/Command.js b/src/commands/model/Command.js index 34b6765c4..0fc0fc1c4 100644 --- a/src/commands/model/Command.js +++ b/src/commands/model/Command.js @@ -1,13 +1,14 @@ -define([ 'backbone'], - function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); /** * @class Command * */ - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults :{ id : '', } }); -}); +}); \ No newline at end of file diff --git a/src/commands/model/Commands.js b/src/commands/model/Commands.js index e9dc389ed..75dfb446d 100644 --- a/src/commands/model/Commands.js +++ b/src/commands/model/Commands.js @@ -1,11 +1,13 @@ -define([ 'backbone','./Command'], - function (Backbone, Command) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Command = require('./Command'); /** * @class Commands * */ - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ model: Command, }); -}); +}); \ No newline at end of file diff --git a/src/commands/view/CommandAbstract.js b/src/commands/view/CommandAbstract.js index 362ad659c..4f45fb597 100644 --- a/src/commands/view/CommandAbstract.js +++ b/src/commands/view/CommandAbstract.js @@ -1,10 +1,11 @@ -define(['backbone'], - function(Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); /** * @class CommandAbstract * @private * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ /** * Initialize method that can't be removed diff --git a/src/commands/view/CreateComponent.js b/src/commands/view/CreateComponent.js index e0fa322fe..008782529 100644 --- a/src/commands/view/CreateComponent.js +++ b/src/commands/view/CreateComponent.js @@ -1,7 +1,9 @@ -define(['backbone','./SelectPosition'], - function(Backbone, SelectPosition) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var SelectPosition = require('./SelectPosition'); - return _.extend({}, SelectPosition, { + module.exports = _.extend({}, SelectPosition, { init: function(opt) { _.bindAll(this,'startDraw','draw','endDraw','rollback'); diff --git a/src/commands/view/DeleteComponent.js b/src/commands/view/DeleteComponent.js index 8cf7b7cf4..38d250575 100644 --- a/src/commands/view/DeleteComponent.js +++ b/src/commands/view/DeleteComponent.js @@ -1,10 +1,12 @@ -define(['backbone', './SelectComponent'], - function(Backbone, SelectComponent) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var SelectComponent = require('./SelectComponent'); /** * @class DeleteComponent * @private * */ - return _.extend({},SelectComponent,{ + module.exports = _.extend({},SelectComponent,{ init: function(o){ _.bindAll(this, 'startDelete', 'stopDelete', 'onDelete'); diff --git a/src/commands/view/ImageComponent.js b/src/commands/view/ImageComponent.js index bfec07b74..2e212cd32 100644 --- a/src/commands/view/ImageComponent.js +++ b/src/commands/view/ImageComponent.js @@ -1,10 +1,12 @@ -define(['backbone', './InsertCustom'], - function(Backbone, InsertCustom) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var InsertCustom = require('./InsertCustom'); /** * @class ImageComponent * @private * */ - return _.extend({}, InsertCustom, { + module.exports = _.extend({}, InsertCustom, { /** * Trigger before insert diff --git a/src/commands/view/InsertCustom.js b/src/commands/view/InsertCustom.js index 06f7323ed..63944000f 100644 --- a/src/commands/view/InsertCustom.js +++ b/src/commands/view/InsertCustom.js @@ -1,10 +1,12 @@ -define(['backbone', './CreateComponent'], - function(Backbone, CreateComponent) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var CreateComponent = require('./CreateComponent'); /** * @class InsertCustom * @private * */ - return _.extend({}, CreateComponent, { + module.exports = _.extend({}, CreateComponent, { init: function(){ CreateComponent.init.apply(this, arguments); diff --git a/src/commands/view/MoveComponent.js b/src/commands/view/MoveComponent.js index 294026bd2..01c93cbc2 100644 --- a/src/commands/view/MoveComponent.js +++ b/src/commands/view/MoveComponent.js @@ -1,7 +1,10 @@ -define(['backbone', './SelectComponent','./SelectPosition'], - function(Backbone, SelectComponent, SelectPosition) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var SelectComponent = require('./SelectComponent'); + var SelectPosition = require('./SelectPosition'); - return _.extend({}, SelectPosition, SelectComponent, { + module.exports = _.extend({}, SelectPosition, SelectComponent, { init: function(o){ SelectComponent.init.apply(this, arguments); @@ -145,4 +148,4 @@ define(['backbone', './SelectComponent','./SelectPosition'], wp.css('cursor', '').unbind().removeClass(this.noSelClass); } }); - }); + }); \ No newline at end of file diff --git a/src/commands/view/OpenLayers.js b/src/commands/view/OpenLayers.js index 18f46df82..c75405a7a 100644 --- a/src/commands/view/OpenLayers.js +++ b/src/commands/view/OpenLayers.js @@ -1,9 +1,11 @@ -define(['Navigator'], function(Layers) { +define(function(require, exports, module){ + 'use strict'; + var Layers = require('Navigator'); /** * @class OpenStyleManager * @private * */ - return { + module.exports = { run: function(em, sender) { if(!this.$layers) { @@ -35,4 +37,4 @@ define(['Navigator'], function(Layers) { this.$layers.hide(); } }; -}); +}); \ No newline at end of file diff --git a/src/commands/view/OpenStyleManager.js b/src/commands/view/OpenStyleManager.js index 8b60e61c7..d40eb3022 100644 --- a/src/commands/view/OpenStyleManager.js +++ b/src/commands/view/OpenStyleManager.js @@ -1,9 +1,11 @@ -define(['StyleManager'], function(StyleManager) { +define(function(require, exports, module){ + 'use strict'; + var StyleManager = require('StyleManager'); /** * @class OpenStyleManager * @private * */ - return { + module.exports = { run: function(em, sender) { this.sender = sender; @@ -79,4 +81,4 @@ define(['StyleManager'], function(StyleManager) { this.$header.hide(); } }; - }); + }); \ No newline at end of file diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js index 7f3fa891a..d7bc30bbf 100644 --- a/src/commands/view/SelectComponent.js +++ b/src/commands/view/SelectComponent.js @@ -5,6 +5,7 @@ define(function(require) { * */ var ToolbarView = require('DomComponents/view/ToolbarView'); var Toolbar = require('DomComponents/model/Toolbar'); + var key = require('keymaster'); return { diff --git a/src/commands/view/TextComponent.js b/src/commands/view/TextComponent.js index 7f73f2383..cfff7d1ad 100644 --- a/src/commands/view/TextComponent.js +++ b/src/commands/view/TextComponent.js @@ -1,10 +1,12 @@ -define(['backbone', './CreateComponent'], - function(Backbone, CreateComponent) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var CreateComponent = require('./CreateComponent'); /** * @class TextComponent * @private * */ - return _.extend({}, CreateComponent, { + module.exports = _.extend({}, CreateComponent, { /** * This event is triggered at the beginning of a draw operation diff --git a/src/css_composer/model/CssRule.js b/src/css_composer/model/CssRule.js index da9caaed0..19dc78d72 100644 --- a/src/css_composer/model/CssRule.js +++ b/src/css_composer/model/CssRule.js @@ -1,6 +1,8 @@ -define(['backbone', './Selectors'], - function (Backbone, Selectors) { - return Backbone.Model.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Selectors = require('./Selectors'); + module.exports = Backbone.Model.extend({ defaults: { // Css selectors @@ -90,4 +92,4 @@ define(['backbone', './Selectors'], }, }); -}); +}); \ No newline at end of file diff --git a/src/css_composer/model/CssRules.js b/src/css_composer/model/CssRules.js index e37bf3db0..c08f0eded 100644 --- a/src/css_composer/model/CssRules.js +++ b/src/css_composer/model/CssRules.js @@ -1,6 +1,8 @@ -define(['backbone','./CssRule'], - function (Backbone, CssRule) { - return Backbone.Collection.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var CssRule = require('./CssRule'); + module.exports = Backbone.Collection.extend({ initialize: function(models, opt){ @@ -31,4 +33,4 @@ define(['backbone','./CssRule'], }, }); -}); +}); \ No newline at end of file diff --git a/src/css_composer/model/Selectors.js b/src/css_composer/model/Selectors.js index 5c7bef5eb..5f54d7049 100644 --- a/src/css_composer/model/Selectors.js +++ b/src/css_composer/model/Selectors.js @@ -1,6 +1,7 @@ -define([ 'backbone', 'require'], - function (Backbone, require) { - return Backbone.Collection.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + module.exports = Backbone.Collection.extend({ initialize: function(models, opt){ diff --git a/src/css_composer/view/CssRuleView.js b/src/css_composer/view/CssRuleView.js index ca8712060..bb49c6dc2 100644 --- a/src/css_composer/view/CssRuleView.js +++ b/src/css_composer/view/CssRuleView.js @@ -1,6 +1,7 @@ -define(['backbone'], - function (Backbone) { - return Backbone.View.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + module.exports = Backbone.View.extend({ tagName: 'style', @@ -52,9 +53,9 @@ define(['backbone'], return sel.join(''); }, - render : function(){ + render : function() { var block = '', - selStr = ''; + selStr = '', o = ''; if(!this.selStr) this.selStr = this.renderSelectors(); diff --git a/src/css_composer/view/CssRulesView.js b/src/css_composer/view/CssRulesView.js index 281eed27a..7d88122aa 100644 --- a/src/css_composer/view/CssRulesView.js +++ b/src/css_composer/view/CssRulesView.js @@ -1,6 +1,8 @@ -define(['backbone','./CssRuleView'], - function (Backbone, CssRuleView) { - return Backbone.View.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var CssRuleView = require('./CssRuleView'); + module.exports = Backbone.View.extend({ initialize: function(o) { this.config = o.config || {}; @@ -58,4 +60,4 @@ define(['backbone','./CssRuleView'], return this; } }); -}); +}); \ No newline at end of file diff --git a/src/device_manager/model/Device.js b/src/device_manager/model/Device.js index 078392c32..9cde6d1fc 100644 --- a/src/device_manager/model/Device.js +++ b/src/device_manager/model/Device.js @@ -1,7 +1,8 @@ -define(['backbone'], - function(Backbone){ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ idAttribute: 'name', @@ -11,4 +12,4 @@ define(['backbone'], }, }); - }); + }); \ No newline at end of file diff --git a/src/device_manager/model/Devices.js b/src/device_manager/model/Devices.js index da0d52ced..984702453 100644 --- a/src/device_manager/model/Devices.js +++ b/src/device_manager/model/Devices.js @@ -1,9 +1,11 @@ -define(['backbone','./Device'], - function (Backbone, Device) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Device = require('./Device'); - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ model: Device, }); -}); +}); \ No newline at end of file diff --git a/src/device_manager/view/DevicesView.js b/src/device_manager/view/DevicesView.js index c2c45dc5c..7264070af 100644 --- a/src/device_manager/view/DevicesView.js +++ b/src/device_manager/view/DevicesView.js @@ -1,7 +1,9 @@ -define(['backbone', 'text!./../template/devices.html'], -function(Backbone, devicesTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var devicesTemplate = require('text!./../template/devices.html'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ template: _.template(devicesTemplate), diff --git a/src/dom_components/model/Component.js b/src/dom_components/model/Component.js index c8fb58d3b..cc31b8c44 100644 --- a/src/dom_components/model/Component.js +++ b/src/dom_components/model/Component.js @@ -1,7 +1,11 @@ -define(['backbone','./Components', 'SelectorManager/model/Selectors', 'TraitManager/model/Traits'], - function (Backbone, Components, Selectors, Traits) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Components = require('./Components'); + var Selectors = require('SelectorManager/model/Selectors'); + var Traits = require('TraitManager/model/Traits'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults: { // HTML tag of the component @@ -368,4 +372,4 @@ define(['backbone','./Components', 'SelectorManager/model/Selectors', 'TraitMana }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ComponentImage.js b/src/dom_components/model/ComponentImage.js index bd20a3fb6..939a00c2f 100644 --- a/src/dom_components/model/ComponentImage.js +++ b/src/dom_components/model/ComponentImage.js @@ -1,7 +1,8 @@ -define(['./Component'], - function (Component) { +define(function(require, exports, module){ + 'use strict'; + var Component = require('./Component'); - return Component.extend({ + module.exports = Component.extend({ defaults: _.extend({}, Component.prototype.defaults, { type: 'image', @@ -100,4 +101,4 @@ define(['./Component'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ComponentLink.js b/src/dom_components/model/ComponentLink.js index e5e5756f6..ca87bc47f 100644 --- a/src/dom_components/model/ComponentLink.js +++ b/src/dom_components/model/ComponentLink.js @@ -1,7 +1,8 @@ -define(['./ComponentText'], - function (Component) { +define(function(require, exports, module){ + 'use strict'; + var Component = require('./ComponentText'); - return Component.extend({ + module.exports = Component.extend({ defaults: _.extend({}, Component.prototype.defaults, { type: 'link', @@ -39,4 +40,4 @@ define(['./ComponentText'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ComponentMap.js b/src/dom_components/model/ComponentMap.js index 7fd12e192..ba430098e 100644 --- a/src/dom_components/model/ComponentMap.js +++ b/src/dom_components/model/ComponentMap.js @@ -1,7 +1,9 @@ -define(['./ComponentImage', './Component'], - function (Component, OComponent) { +define(function(require, exports, module){ + 'use strict'; + var Component = require('./ComponentImage'); + var OComponent = require('./Component'); - return Component.extend({ + module.exports = Component.extend({ defaults: _.extend({}, Component.prototype.defaults, { type: 'map', @@ -105,4 +107,4 @@ define(['./ComponentImage', './Component'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ComponentScript.js b/src/dom_components/model/ComponentScript.js index d82cbcaaf..48048a154 100644 --- a/src/dom_components/model/ComponentScript.js +++ b/src/dom_components/model/ComponentScript.js @@ -1,7 +1,8 @@ -define(['./Component'], - function (Component) { +define(function(require, exports, module){ + 'use strict'; + var Component = require('./Component'); - return Component.extend({ + module.exports = Component.extend({ defaults: _.extend({}, Component.prototype.defaults, { type: 'script', @@ -26,4 +27,4 @@ define(['./Component'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ComponentTable.js b/src/dom_components/model/ComponentTable.js index d36c2dfda..a53d7b0b1 100644 --- a/src/dom_components/model/ComponentTable.js +++ b/src/dom_components/model/ComponentTable.js @@ -1,7 +1,8 @@ -define(['./Component'], - function (Component) { +define(function(require, exports, module){ + 'use strict'; + var Component = require('./Component'); - return Component.extend({ + module.exports = Component.extend({ defaults: _.extend({}, Component.prototype.defaults, { type: 'table', @@ -88,4 +89,4 @@ define(['./Component'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ComponentTableCell.js b/src/dom_components/model/ComponentTableCell.js index ae961ccc9..88cb159b6 100644 --- a/src/dom_components/model/ComponentTableCell.js +++ b/src/dom_components/model/ComponentTableCell.js @@ -1,7 +1,8 @@ -define(['./Component'], - function (Component) { +define(function(require, exports, module){ + 'use strict'; + var Component = require('./Component'); - return Component.extend({ + module.exports = Component.extend({ defaults: _.extend({}, Component.prototype.defaults, { type: 'cell', @@ -32,4 +33,4 @@ define(['./Component'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ComponentTableRow.js b/src/dom_components/model/ComponentTableRow.js index 52789705d..977c9ae04 100644 --- a/src/dom_components/model/ComponentTableRow.js +++ b/src/dom_components/model/ComponentTableRow.js @@ -1,7 +1,8 @@ -define(['./Component'], - function (Component) { +define(function(require, exports, module){ + 'use strict'; + var Component = require('./Component'); - return Component.extend({ + module.exports = Component.extend({ defaults: _.extend({}, Component.prototype.defaults, { type: 'row', @@ -43,4 +44,4 @@ define(['./Component'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ComponentText.js b/src/dom_components/model/ComponentText.js index f6db75eef..151eff3e1 100644 --- a/src/dom_components/model/ComponentText.js +++ b/src/dom_components/model/ComponentText.js @@ -1,7 +1,8 @@ -define(['./Component'], - function (Component) { +define(function(require, exports, module){ + 'use strict'; + var Component = require('./Component'); - return Component.extend({ + module.exports = Component.extend({ defaults: _.extend({}, Component.prototype.defaults, { type: 'text', @@ -10,4 +11,4 @@ define(['./Component'], }), }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ComponentTextNode.js b/src/dom_components/model/ComponentTextNode.js index cc8146290..719abb512 100644 --- a/src/dom_components/model/ComponentTextNode.js +++ b/src/dom_components/model/ComponentTextNode.js @@ -1,7 +1,8 @@ -define(['./Component'], - function (Component) { +define(function(require, exports, module){ + 'use strict'; + var Component = require('./Component'); - return Component.extend({ + module.exports = Component.extend({ defaults: _.extend({}, Component.prototype.defaults, { droppable: false, @@ -26,4 +27,4 @@ define(['./Component'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ComponentVideo.js b/src/dom_components/model/ComponentVideo.js index cbce29fc7..17af8b317 100644 --- a/src/dom_components/model/ComponentVideo.js +++ b/src/dom_components/model/ComponentVideo.js @@ -1,10 +1,12 @@ -define(['./ComponentImage', './Component'], - function (Component, OComponent) { +define(function(require, exports, module){ + 'use strict'; + var Component = require('./ComponentImage'); + var OComponent = require('./Component'); var yt = 'yt'; var vi = 'vi'; - return Component.extend({ + module.exports = Component.extend({ defaults: _.extend({}, Component.prototype.defaults, { type: 'video', @@ -314,4 +316,4 @@ define(['./ComponentImage', './Component'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/Components.js b/src/dom_components/model/Components.js index 4e245e0fd..8bd2f5156 100644 --- a/src/dom_components/model/Components.js +++ b/src/dom_components/model/Components.js @@ -1,7 +1,8 @@ -define([ 'backbone', 'require'], - function (Backbone, require) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ initialize: function(models, opt){ diff --git a/src/dom_components/model/Toolbar.js b/src/dom_components/model/Toolbar.js index 7d66f8f46..41cc02310 100644 --- a/src/dom_components/model/Toolbar.js +++ b/src/dom_components/model/Toolbar.js @@ -1,6 +1,8 @@ -define(['backbone','./ToolbarButton'], - function (Backbone, ToolbarButton) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ToolbarButton = require('./ToolbarButton'); - return Backbone.Collection.extend({model: ToolbarButton}); + module.exports = Backbone.Collection.extend({model: ToolbarButton}); -}); +}); \ No newline at end of file diff --git a/src/dom_components/model/ToolbarButton.js b/src/dom_components/model/ToolbarButton.js index 5df5bbea8..04983b0e5 100644 --- a/src/dom_components/model/ToolbarButton.js +++ b/src/dom_components/model/ToolbarButton.js @@ -1,7 +1,8 @@ -define(['backbone'], - function(Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults: { command: '', @@ -10,4 +11,4 @@ define(['backbone'], }); - }); + }); \ No newline at end of file diff --git a/src/dom_components/view/ComponentImageView.js b/src/dom_components/view/ComponentImageView.js index 0dda4cb9b..881ba98c4 100644 --- a/src/dom_components/view/ComponentImageView.js +++ b/src/dom_components/view/ComponentImageView.js @@ -1,7 +1,9 @@ -define(['backbone', './ComponentView'], - function (Backbone, ComponentView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ComponentView = require('./ComponentView'); - return ComponentView.extend({ + module.exports = ComponentView.extend({ tagName: 'img', @@ -69,4 +71,4 @@ define(['backbone', './ComponentView'], return this; }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentLinkView.js b/src/dom_components/view/ComponentLinkView.js index 3895a491c..8c4e28c48 100644 --- a/src/dom_components/view/ComponentLinkView.js +++ b/src/dom_components/view/ComponentLinkView.js @@ -1,8 +1,9 @@ -/*jshint scripturl:true*/ -define(['backbone', './ComponentTextView'], - function (Backbone, ComponentView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ComponentView = require('./ComponentTextView'); - return ComponentView.extend({ + module.exports = ComponentView.extend({ events: { 'dblclick': 'enableEditing', @@ -19,4 +20,4 @@ define(['backbone', './ComponentTextView'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentMapView.js b/src/dom_components/view/ComponentMapView.js index 8f7f53fb7..fc0972d84 100644 --- a/src/dom_components/view/ComponentMapView.js +++ b/src/dom_components/view/ComponentMapView.js @@ -1,7 +1,9 @@ -define(['backbone', './ComponentImageView'], - function (Backbone, ComponentView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ComponentView = require('./ComponentImageView'); - return ComponentView.extend({ + module.exports = ComponentView.extend({ tagName: 'div', @@ -41,4 +43,4 @@ define(['backbone', './ComponentImageView'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentScriptView.js b/src/dom_components/view/ComponentScriptView.js index 3c5eaf45b..2272d4a66 100644 --- a/src/dom_components/view/ComponentScriptView.js +++ b/src/dom_components/view/ComponentScriptView.js @@ -1,7 +1,9 @@ -define(['backbone', './ComponentImageView'], - function (Backbone, ComponentView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ComponentView = require('./ComponentImageView'); - return ComponentView.extend({ + module.exports = ComponentView.extend({ tagName: 'script', @@ -39,4 +41,4 @@ define(['backbone', './ComponentImageView'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentTableCellView.js b/src/dom_components/view/ComponentTableCellView.js index 5626864bd..da4fdd6a5 100644 --- a/src/dom_components/view/ComponentTableCellView.js +++ b/src/dom_components/view/ComponentTableCellView.js @@ -1,6 +1,8 @@ -define(['backbone', './ComponentView'], - function (Backbone, ComponentView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ComponentView = require('./ComponentView'); - return ComponentView.extend({ + module.exports = ComponentView.extend({ }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentTableRowView.js b/src/dom_components/view/ComponentTableRowView.js index 5626864bd..da4fdd6a5 100644 --- a/src/dom_components/view/ComponentTableRowView.js +++ b/src/dom_components/view/ComponentTableRowView.js @@ -1,6 +1,8 @@ -define(['backbone', './ComponentView'], - function (Backbone, ComponentView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ComponentView = require('./ComponentView'); - return ComponentView.extend({ + module.exports = ComponentView.extend({ }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentTableView.js b/src/dom_components/view/ComponentTableView.js index 75c7d9296..6251a5f13 100644 --- a/src/dom_components/view/ComponentTableView.js +++ b/src/dom_components/view/ComponentTableView.js @@ -1,9 +1,11 @@ -define(['backbone', './ComponentView'], - function (Backbone, ComponentView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ComponentView = require('./ComponentView'); - return ComponentView.extend({ + module.exports = ComponentView.extend({ events: {}, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentTextNodeView.js b/src/dom_components/view/ComponentTextNodeView.js index 29abacbe2..6191cb425 100644 --- a/src/dom_components/view/ComponentTextNodeView.js +++ b/src/dom_components/view/ComponentTextNodeView.js @@ -1,5 +1,6 @@ -define(['backbone'], - function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.View.extend({}); -}); + module.exports = Backbone.View.extend({}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentTextView.js b/src/dom_components/view/ComponentTextView.js index b8fa93b9e..1b7b9714b 100644 --- a/src/dom_components/view/ComponentTextView.js +++ b/src/dom_components/view/ComponentTextView.js @@ -1,7 +1,9 @@ -define(['backbone', './ComponentView'], - function (Backbone, ComponentView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ComponentView = require('./ComponentView'); - return ComponentView.extend({ + module.exports = ComponentView.extend({ events: { 'dblclick': 'enableEditing', @@ -108,4 +110,4 @@ define(['backbone', './ComponentView'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentVideoView.js b/src/dom_components/view/ComponentVideoView.js index 7141b326f..835ab5b96 100644 --- a/src/dom_components/view/ComponentVideoView.js +++ b/src/dom_components/view/ComponentVideoView.js @@ -1,7 +1,9 @@ -define(['backbone', './ComponentImageView'], - function (Backbone, ComponentView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ComponentView = require('./ComponentImageView'); - return ComponentView.extend({ + module.exports = ComponentView.extend({ tagName: 'div', @@ -116,4 +118,4 @@ define(['backbone', './ComponentImageView'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js index e794f5b24..3a9f6c289 100644 --- a/src/dom_components/view/ComponentView.js +++ b/src/dom_components/view/ComponentView.js @@ -1,7 +1,9 @@ -define(['backbone', './ComponentsView'], - function (Backbone, ComponentsView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ComponentsView = require('./ComponentsView'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ events: { 'click': 'initResize', @@ -392,4 +394,4 @@ define(['backbone', './ComponentsView'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ComponentsView.js b/src/dom_components/view/ComponentsView.js index 74c68f8a9..4d29cf44b 100644 --- a/src/dom_components/view/ComponentsView.js +++ b/src/dom_components/view/ComponentsView.js @@ -1,7 +1,8 @@ -define(['backbone','require'], -function(Backbone, require) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(o) { this.opts = o || {}; diff --git a/src/dom_components/view/ToolbarButtonView.js b/src/dom_components/view/ToolbarButtonView.js index c9ca1fdad..176cc2254 100644 --- a/src/dom_components/view/ToolbarButtonView.js +++ b/src/dom_components/view/ToolbarButtonView.js @@ -1,7 +1,8 @@ -define(['backbone'], - function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ events: { 'mousedown': 'handleClick', @@ -34,4 +35,4 @@ define(['backbone'], }, }); -}); +}); \ No newline at end of file diff --git a/src/dom_components/view/ToolbarView.js b/src/dom_components/view/ToolbarView.js index c80ab4ab0..ec51c5933 100644 --- a/src/dom_components/view/ToolbarView.js +++ b/src/dom_components/view/ToolbarView.js @@ -1,7 +1,10 @@ -define(['backbone', 'Abstract/view/DomainViews', './ToolbarButtonView'], - function (Backbone, DomainViews, ToolbarButtonView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var DomainViews = require('Abstract/view/DomainViews'); + var ToolbarButtonView = require('./ToolbarButtonView'); - return DomainViews.extend({ + module.exports = DomainViews.extend({ itemView: ToolbarButtonView, @@ -12,4 +15,4 @@ define(['backbone', 'Abstract/view/DomainViews', './ToolbarButtonView'], }); -}); +}); \ No newline at end of file diff --git a/src/domain_abstract/ui/Input.js b/src/domain_abstract/ui/Input.js index 70fd04fc6..6a3de1f04 100644 --- a/src/domain_abstract/ui/Input.js +++ b/src/domain_abstract/ui/Input.js @@ -1,7 +1,9 @@ -define(['backbone', 'text!./templates/input.html'], - function (Backbone, inputTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var inputTemplate = require('text!./templates/input.html'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ events: { 'change': 'handleChange', @@ -80,4 +82,4 @@ define(['backbone', 'text!./templates/input.html'], } }); -}); +}); \ No newline at end of file diff --git a/src/domain_abstract/ui/InputColor.js b/src/domain_abstract/ui/InputColor.js index 0e3306f8c..0b5e612be 100644 --- a/src/domain_abstract/ui/InputColor.js +++ b/src/domain_abstract/ui/InputColor.js @@ -1,7 +1,11 @@ -define(['backbone', './Input', 'Spectrum', 'text!./templates/inputColor.html'], - function (Backbone, Input, Spectrum, inputTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Input = require('./Input'); + var Spectrum = require('Spectrum'); + var inputTemplate = require('text!./templates/inputColor.html'); - return Input.extend({ + module.exports = Input.extend({ template: _.template(inputTemplate), @@ -71,4 +75,4 @@ define(['backbone', './Input', 'Spectrum', 'text!./templates/inputColor.html'], } }); -}); +}); \ No newline at end of file diff --git a/src/domain_abstract/ui/InputNumber.js b/src/domain_abstract/ui/InputNumber.js index 3cc5b13ec..5872dbabb 100644 --- a/src/domain_abstract/ui/InputNumber.js +++ b/src/domain_abstract/ui/InputNumber.js @@ -1,7 +1,9 @@ -define(['backbone', 'text!./templates/inputNumber.html'], - function (Backbone, inputTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var inputTemplate = require('text!./templates/inputNumber.html'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ events: {}, @@ -245,4 +247,4 @@ define(['backbone', 'text!./templates/inputNumber.html'], } }); -}); +}); \ No newline at end of file diff --git a/src/domain_abstract/view/DomainViews.js b/src/domain_abstract/view/DomainViews.js index 7c9032575..95b4d06bc 100644 --- a/src/domain_abstract/view/DomainViews.js +++ b/src/domain_abstract/view/DomainViews.js @@ -1,7 +1,8 @@ -define(['backbone'], -function(Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ // Default view itemView: '', @@ -66,4 +67,4 @@ function(Backbone) { }, }); -}); +}); \ No newline at end of file diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js index 45a2178f0..9a815ae17 100644 --- a/src/editor/model/Editor.js +++ b/src/editor/model/Editor.js @@ -1,12 +1,48 @@ -var deps = ['Utils', 'StorageManager', 'DeviceManager', 'Parser', 'SelectorManager', 'ModalDialog', 'CodeManager', 'Panels', - 'RichTextEditor', 'StyleManager', 'AssetManager', 'CssComposer', 'DomComponents', 'Canvas', 'Commands', 'BlockManager', 'TraitManager']; - -// r.js do not see deps if I pass them as a variable -// http://stackoverflow.com/questions/27545412/optimization-fails-when-passing-a-variable-with-a-list-of-dependencies-to-define -define(['backbone', 'backboneUndo', 'keymaster', 'Utils', 'StorageManager', 'DeviceManager', 'Parser', 'SelectorManager', -'ModalDialog', 'CodeManager', 'Panels', 'RichTextEditor', 'StyleManager', 'AssetManager', 'CssComposer', 'DomComponents', -'Canvas', 'Commands', 'BlockManager', 'TraitManager'], function(){ - return Backbone.Model.extend({ +define(function(require, exports, module){ + 'use strict'; + var deps = [ + require('Utils'), + require('StorageManager'), + require('DeviceManager'), + require('Parser'), + require('SelectorManager'), + require('ModalDialog'), + require('CodeManager'), + require('Panels'), + require('RichTextEditor'), + require('StyleManager'), + require('AssetManager'), + require('CssComposer'), + require('DomComponents'), + require('Canvas'), + require('Commands'), + require('BlockManager'), + require('TraitManager'), + ]; + + require('backbone'); + require('backboneUndo'); + var key = require('keymaster'); + /* + require('Utils'); + require('StorageManager'); + require('DeviceManager'); + require('Parser'); + require('SelectorManager'); + require('ModalDialog'); + require('CodeManager'); + require('Panels'); + require('RichTextEditor'); + require('StyleManager'); + require('AssetManager'); + require('CssComposer'); + require('DomComponents'); + require('Canvas'); + require('Commands'); + require('BlockManager'); + require('TraitManager'); + */ + module.exports = Backbone.Model.extend({ defaults: { clipboard: null, @@ -64,7 +100,7 @@ define(['backbone', 'backboneUndo', 'keymaster', 'Utils', 'StorageManager', 'Dev */ loadModule: function(moduleName) { var c = this.config; - var M = new require(moduleName)(); + var M = new moduleName(); var name = M.name.charAt(0).toLowerCase() + M.name.slice(1); var cfg = c[name] || c[M.name] || {}; cfg.pStylePrefix = c.pStylePrefix || ''; diff --git a/src/editor/view/EditorView.js b/src/editor/view/EditorView.js index 26adf395d..5cbd98a05 100644 --- a/src/editor/view/EditorView.js +++ b/src/editor/view/EditorView.js @@ -1,7 +1,8 @@ -define(['backbone'], -function(Backbone){ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function() { this.pn = this.model.get('Panels'); @@ -52,4 +53,4 @@ function(Backbone){ return this; } }); -}); +}); \ No newline at end of file diff --git a/src/modal_dialog/model/Modal.js b/src/modal_dialog/model/Modal.js index 4fa50224d..7fa913058 100644 --- a/src/modal_dialog/model/Modal.js +++ b/src/modal_dialog/model/Modal.js @@ -1,9 +1,11 @@ -define(['backbone'], function(Backbone) { - return Backbone.Model.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + module.exports = Backbone.Model.extend({ defaults: { title: '', content: '', open: false, } }); -}); +}); \ No newline at end of file diff --git a/src/modal_dialog/view/ModalView.js b/src/modal_dialog/view/ModalView.js index efc267a3f..0974228fa 100644 --- a/src/modal_dialog/view/ModalView.js +++ b/src/modal_dialog/view/ModalView.js @@ -1,6 +1,8 @@ -define(['backbone', 'text!./../template/modal.html'], - function (Backbone, modalTemplate) { - return Backbone.View.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var modalTemplate = require('text!./../template/modal.html'); + module.exports = Backbone.View.extend({ template: _.template(modalTemplate), @@ -110,4 +112,4 @@ define(['backbone', 'text!./../template/modal.html'], }, }); -}); +}); \ No newline at end of file diff --git a/src/navigator/view/ItemView.js b/src/navigator/view/ItemView.js index 1035344b5..e38ff9e53 100644 --- a/src/navigator/view/ItemView.js +++ b/src/navigator/view/ItemView.js @@ -1,5 +1,10 @@ -define(['backbone', 'text!./../template/item.html','require'], function (Backbone, ItemTemplate, require) { - return Backbone.View.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ItemTemplate = require('text!./../template/item.html'); + var ItemsView; + + module.exports = Backbone.View.extend({ template: _.template(ItemTemplate), diff --git a/src/navigator/view/ItemsView.js b/src/navigator/view/ItemsView.js index d3ea6fb8f..243f13d87 100644 --- a/src/navigator/view/ItemsView.js +++ b/src/navigator/view/ItemsView.js @@ -1,9 +1,11 @@ -define(['backbone','./ItemView'], - function (Backbone, ItemView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ItemView = require('./ItemView'); /** * @class ItemsView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(o) { this.opt = o; @@ -124,4 +126,4 @@ define(['backbone','./ItemView'], return this; } }); -}); +}); \ No newline at end of file diff --git a/src/panels/model/Button.js b/src/panels/model/Button.js index e01169545..e9463e0c1 100644 --- a/src/panels/model/Button.js +++ b/src/panels/model/Button.js @@ -1,9 +1,10 @@ -define([ 'backbone','require'], - function (Backbone, require) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); /** * @class Button * */ - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults :{ id: '', diff --git a/src/panels/model/Buttons.js b/src/panels/model/Buttons.js index e7ee14518..deaae00a2 100644 --- a/src/panels/model/Buttons.js +++ b/src/panels/model/Buttons.js @@ -1,9 +1,11 @@ -define([ 'backbone','./Button'], - function (Backbone, Button) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Button = require('./Button'); /** * @class Buttons * */ - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ model: Button, @@ -42,4 +44,4 @@ define([ 'backbone','./Button'], }, }); -}); +}); \ No newline at end of file diff --git a/src/panels/model/Panel.js b/src/panels/model/Panel.js index 7b0a0df2a..6e1fb1c7a 100644 --- a/src/panels/model/Panel.js +++ b/src/panels/model/Panel.js @@ -1,9 +1,11 @@ -define([ 'backbone','./Buttons'], - function (Backbone, Buttons) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Buttons = require('./Buttons'); /** * @class Panel * */ - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults :{ id : '', @@ -19,4 +21,4 @@ define([ 'backbone','./Buttons'], }, }); -}); +}); \ No newline at end of file diff --git a/src/panels/model/Panels.js b/src/panels/model/Panels.js index da177628a..efb1188fc 100644 --- a/src/panels/model/Panels.js +++ b/src/panels/model/Panels.js @@ -1,9 +1,11 @@ -define([ 'backbone','./Panel'], - function (Backbone, Panel) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Panel = require('./Panel'); - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ model: Panel, }); -}); +}); \ No newline at end of file diff --git a/src/panels/view/ButtonView.js b/src/panels/view/ButtonView.js index eaecd02e1..2940ae782 100644 --- a/src/panels/view/ButtonView.js +++ b/src/panels/view/ButtonView.js @@ -1,9 +1,10 @@ -define(['backbone','require'], -function(Backbone, require) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); /** * @class ButtonView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ tagName: 'span', diff --git a/src/panels/view/ButtonsView.js b/src/panels/view/ButtonsView.js index 7c4bfa8bb..f4c434037 100644 --- a/src/panels/view/ButtonsView.js +++ b/src/panels/view/ButtonsView.js @@ -1,9 +1,11 @@ -define(['backbone','./ButtonView'], - function (Backbone, ButtonView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ButtonView = require('./ButtonView'); /** * @class ButtonsView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(o) { this.opt = o || {}; @@ -65,4 +67,4 @@ define(['backbone','./ButtonView'], return this; } }); -}); +}); \ No newline at end of file diff --git a/src/panels/view/PanelView.js b/src/panels/view/PanelView.js index 568406213..cf47dbf18 100644 --- a/src/panels/view/PanelView.js +++ b/src/panels/view/PanelView.js @@ -1,9 +1,11 @@ -define(['backbone','./ButtonsView'], -function(Backbone, ButtonsView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var ButtonsView = require('./ButtonsView'); /** * @class PanelView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(o){ this.config = o.config || {}; diff --git a/src/panels/view/PanelsView.js b/src/panels/view/PanelsView.js index 5c185a9fa..d032cf314 100644 --- a/src/panels/view/PanelsView.js +++ b/src/panels/view/PanelsView.js @@ -1,10 +1,12 @@ -define(['backbone','./PanelView'], - function (Backbone, PanelView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var PanelView = require('./PanelView'); /** * @class ItemsView * @private * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(o) { this.opt = o || {}; @@ -67,4 +69,4 @@ define(['backbone','./PanelView'], return this; } }); -}); +}); \ No newline at end of file diff --git a/src/rich_text_editor/model/CommandButton.js b/src/rich_text_editor/model/CommandButton.js index e02c07a9e..162bc138d 100644 --- a/src/rich_text_editor/model/CommandButton.js +++ b/src/rich_text_editor/model/CommandButton.js @@ -1,6 +1,7 @@ -define(['backbone'], - function (Backbone) { - return Backbone.Model.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + module.exports = Backbone.Model.extend({ idAttribute: 'command', @@ -19,4 +20,4 @@ define(['backbone'], }, }); -}); +}); \ No newline at end of file diff --git a/src/rich_text_editor/model/CommandButtons.js b/src/rich_text_editor/model/CommandButtons.js index da765e6ac..c10400016 100644 --- a/src/rich_text_editor/model/CommandButtons.js +++ b/src/rich_text_editor/model/CommandButtons.js @@ -1,8 +1,10 @@ -define([ 'backbone','./CommandButton'], - function (Backbone, CommandButton) { - return Backbone.Collection.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var CommandButton = require('./CommandButton'); + module.exports = Backbone.Collection.extend({ model: CommandButton, }); -}); +}); \ No newline at end of file diff --git a/src/rich_text_editor/view/CommandButtonSelectView.js b/src/rich_text_editor/view/CommandButtonSelectView.js index 0e3ee8ed3..c521486ba 100644 --- a/src/rich_text_editor/view/CommandButtonSelectView.js +++ b/src/rich_text_editor/view/CommandButtonSelectView.js @@ -1,6 +1,8 @@ -define(['backbone', './CommandButtonView'], - function (Backbone, CommandButtonView) { - return CommandButtonView.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var CommandButtonView = require('./CommandButtonView'); + module.exports = CommandButtonView.extend({ initialize: function(o, config){ CommandButtonView.prototype.initialize.apply(this, arguments); @@ -39,4 +41,4 @@ define(['backbone', './CommandButtonView'], return this; } }); -}); +}); \ No newline at end of file diff --git a/src/rich_text_editor/view/CommandButtonView.js b/src/rich_text_editor/view/CommandButtonView.js index 95ac24f94..9adc63fb3 100644 --- a/src/rich_text_editor/view/CommandButtonView.js +++ b/src/rich_text_editor/view/CommandButtonView.js @@ -1,6 +1,7 @@ -define(['backbone'], - function (Backbone) { - return Backbone.View.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + module.exports = Backbone.View.extend({ tagName: 'a', @@ -15,4 +16,4 @@ define(['backbone'], return this; } }); -}); +}); \ No newline at end of file diff --git a/src/rich_text_editor/view/CommandButtonsView.js b/src/rich_text_editor/view/CommandButtonsView.js index 9c992ac3d..916878663 100644 --- a/src/rich_text_editor/view/CommandButtonsView.js +++ b/src/rich_text_editor/view/CommandButtonsView.js @@ -1,6 +1,9 @@ -define(['backbone','./CommandButtonView', './CommandButtonSelectView'], - function (Backbone, CommandButtonView, CommandButtonSelectView) { - return Backbone.View.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var CommandButtonView = require('./CommandButtonView'); + var CommandButtonSelectView = require('./CommandButtonSelectView'); + module.exports = Backbone.View.extend({ attributes : { 'data-role': 'editor-toolbar', @@ -72,4 +75,4 @@ define(['backbone','./CommandButtonView', './CommandButtonSelectView'], } }); -}); +}); \ No newline at end of file diff --git a/src/rich_text_editor/view/TextEditorView.js b/src/rich_text_editor/view/TextEditorView.js index 58b79a2dd..c439d2f2a 100644 --- a/src/rich_text_editor/view/TextEditorView.js +++ b/src/rich_text_editor/view/TextEditorView.js @@ -1,6 +1,6 @@ -/*jslint browser:true*/ -define(['jquery'], - function ($) { +define(function(require, exports, module){ + 'use strict'; + var $ = require('jquery'); var readFileIntoDataUrl = function (fileInfo) { var loader = $.Deferred(), @@ -232,5 +232,5 @@ define(['jquery'], fileUploadError: function (reason, detail) { console.log("File upload error", reason, detail); } }; - return $; -}); + module.exports = $; +}); \ No newline at end of file diff --git a/src/selector_manager/model/Selector.js b/src/selector_manager/model/Selector.js index fd2a68fc3..390cabaeb 100644 --- a/src/selector_manager/model/Selector.js +++ b/src/selector_manager/model/Selector.js @@ -1,6 +1,7 @@ -define(['backbone'], - function (Backbone) { - return Backbone.Model.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + module.exports = Backbone.Model.extend({ idAttribute: 'name', @@ -29,4 +30,4 @@ define(['backbone'], }, }); -}); +}); \ No newline at end of file diff --git a/src/selector_manager/model/Selectors.js b/src/selector_manager/model/Selectors.js index 04e716cdb..d12934dac 100644 --- a/src/selector_manager/model/Selectors.js +++ b/src/selector_manager/model/Selectors.js @@ -1,9 +1,11 @@ -define(['backbone','./Selector'], - function (Backbone, Selector) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Selector = require('./Selector'); - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ model: Selector, }); -}); +}); \ No newline at end of file diff --git a/src/selector_manager/view/ClassTagView.js b/src/selector_manager/view/ClassTagView.js index 830682e37..276337d1f 100644 --- a/src/selector_manager/view/ClassTagView.js +++ b/src/selector_manager/view/ClassTagView.js @@ -1,6 +1,8 @@ -define(['backbone', 'text!./../template/classTag.html'], - function (Backbone, tagTemplate) { - return Backbone.View.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var tagTemplate = require('text!./../template/classTag.html'); + module.exports = Backbone.View.extend({ template: _.template(tagTemplate), @@ -129,4 +131,4 @@ define(['backbone', 'text!./../template/classTag.html'], }, }); -}); +}); \ No newline at end of file diff --git a/src/selector_manager/view/ClassTagsView.js b/src/selector_manager/view/ClassTagsView.js index 73ac30d35..339d7339c 100644 --- a/src/selector_manager/view/ClassTagsView.js +++ b/src/selector_manager/view/ClassTagsView.js @@ -1,6 +1,9 @@ -define(['backbone', 'text!./../template/classTags.html', './ClassTagView'], - function (Backbone, tagsTemplate, ClassTagView) { - return Backbone.View.extend({ +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var tagsTemplate = require('text!./../template/classTags.html'); + var ClassTagView = require('./ClassTagView'); + module.exports = Backbone.View.extend({ template: _.template(tagsTemplate), @@ -283,4 +286,4 @@ define(['backbone', 'text!./../template/classTags.html', './ClassTagView'], }, }); -}); +}); \ No newline at end of file diff --git a/src/storage_manager/model/LocalStorage.js b/src/storage_manager/model/LocalStorage.js index ae0d2525e..69bce7757 100644 --- a/src/storage_manager/model/LocalStorage.js +++ b/src/storage_manager/model/LocalStorage.js @@ -1,7 +1,8 @@ -define(['backbone'], - function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults: { checkLocal: true, @@ -57,4 +58,4 @@ define(['backbone'], }, }); -}); +}); \ No newline at end of file diff --git a/src/storage_manager/model/RemoteStorage.js b/src/storage_manager/model/RemoteStorage.js index fae4fb487..5b85995a4 100644 --- a/src/storage_manager/model/RemoteStorage.js +++ b/src/storage_manager/model/RemoteStorage.js @@ -1,9 +1,10 @@ -define(['backbone'], - function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); /** * @class RemoteStorage * */ - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults: { urlStore: '', @@ -69,4 +70,4 @@ define(['backbone'], }, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/model/Layer.js b/src/style_manager/model/Layer.js index a788f4862..5201a74ad 100644 --- a/src/style_manager/model/Layer.js +++ b/src/style_manager/model/Layer.js @@ -1,7 +1,8 @@ -define(['backbone'], - function(Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults: { index: '', @@ -29,4 +30,4 @@ define(['backbone'], }, }); - }); + }); \ No newline at end of file diff --git a/src/style_manager/model/Layers.js b/src/style_manager/model/Layers.js index a5e8f3bd0..01d616db8 100644 --- a/src/style_manager/model/Layers.js +++ b/src/style_manager/model/Layers.js @@ -1,7 +1,9 @@ -define([ 'backbone', './Layer'], - function (Backbone, Layer) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Layer = require('./Layer'); - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ model: Layer, @@ -21,4 +23,4 @@ define([ 'backbone', './Layer'], }, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/model/Properties.js b/src/style_manager/model/Properties.js index 6ea05cb17..eb2b40724 100644 --- a/src/style_manager/model/Properties.js +++ b/src/style_manager/model/Properties.js @@ -1,9 +1,11 @@ -define([ 'backbone', './Property'], - function (Backbone, Property) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Property = require('./Property'); - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ model: Property, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/model/Property.js b/src/style_manager/model/Property.js index 91dfad5bf..60eab8f93 100644 --- a/src/style_manager/model/Property.js +++ b/src/style_manager/model/Property.js @@ -1,7 +1,9 @@ -define(['backbone', './Layers', 'require'], - function(Backbone, Layers, require) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Layers = require('./Layers'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults: { name: '', diff --git a/src/style_manager/model/PropertyFactory.js b/src/style_manager/model/PropertyFactory.js index 8a664ef3b..506609dea 100644 --- a/src/style_manager/model/PropertyFactory.js +++ b/src/style_manager/model/PropertyFactory.js @@ -1,7 +1,8 @@ -define(['backbone'], - function(Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return function() { + module.exports = function() { return { /** @@ -462,4 +463,4 @@ define(['backbone'], }; }; -}); +}); \ No newline at end of file diff --git a/src/style_manager/model/Sector.js b/src/style_manager/model/Sector.js index fc29c2397..bc34b9123 100644 --- a/src/style_manager/model/Sector.js +++ b/src/style_manager/model/Sector.js @@ -1,7 +1,10 @@ -define(['backbone', './Properties', './PropertyFactory'], - function(Backbone, Properties, PropertyFactory) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Properties = require('./Properties'); + var PropertyFactory = require('./PropertyFactory'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults: { id: '', @@ -91,4 +94,4 @@ define(['backbone', './Properties', './PropertyFactory'], }, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/model/Sectors.js b/src/style_manager/model/Sectors.js index 7c224918f..3da7dd3de 100644 --- a/src/style_manager/model/Sectors.js +++ b/src/style_manager/model/Sectors.js @@ -1,9 +1,11 @@ -define([ 'backbone', './Sector'], - function (Backbone, Sector) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Sector = require('./Sector'); - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ model: Sector, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/view/LayerView.js b/src/style_manager/view/LayerView.js index 14ae728b6..e5e10ddfa 100644 --- a/src/style_manager/view/LayerView.js +++ b/src/style_manager/view/LayerView.js @@ -1,9 +1,11 @@ -define(['backbone', 'text!./../templates/layer.html'], - function (Backbone, layerTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var layerTemplate = require('text!./../templates/layer.html'); /** * @class LayerView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ events:{ 'click': 'updateIndex', @@ -177,4 +179,4 @@ define(['backbone', 'text!./../templates/layer.html'], }, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/view/LayersView.js b/src/style_manager/view/LayersView.js index 5c28afd17..95511515b 100644 --- a/src/style_manager/view/LayersView.js +++ b/src/style_manager/view/LayersView.js @@ -1,9 +1,11 @@ -define(['backbone','./LayerView'], - function (Backbone, LayerView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var LayerView = require('./LayerView'); /** * @class LayersView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(o) { this.config = o.config || {}; @@ -114,4 +116,4 @@ define(['backbone','./LayerView'], return this; } }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/view/PropertiesView.js b/src/style_manager/view/PropertiesView.js index 463846533..726b15f31 100644 --- a/src/style_manager/view/PropertiesView.js +++ b/src/style_manager/view/PropertiesView.js @@ -1,11 +1,18 @@ -define(['backbone','./PropertyView', './PropertyIntegerView', './PropertyRadioView', './PropertySelectView', - './PropertyColorView', './PropertyFileView', './PropertyCompositeView', './PropertyStackView'], - function (Backbone, PropertyView, PropertyIntegerView, PropertyRadioView, PropertySelectView, - PropertyColorView, PropertyFileView, PropertyCompositeView, PropertyStackView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var PropertyView = require('./PropertyView'); + var PropertyIntegerView = require('./PropertyIntegerView'); + var PropertyRadioView = require('./PropertyRadioView'); + var PropertySelectView = require('./PropertySelectView'); + var PropertyColorView = require('./PropertyColorView'); + var PropertyFileView = require('./PropertyFileView'); + var PropertyCompositeView = require('./PropertyCompositeView'); + var PropertyStackView = require('./PropertyStackView'); /** * @class PropertiesView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(o) { this.config = o.config || {}; @@ -64,4 +71,4 @@ define(['backbone','./PropertyView', './PropertyIntegerView', './PropertyRadioVi return this; } }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/view/PropertyColorView.js b/src/style_manager/view/PropertyColorView.js index e38ac894f..e2d8f24c1 100644 --- a/src/style_manager/view/PropertyColorView.js +++ b/src/style_manager/view/PropertyColorView.js @@ -1,7 +1,10 @@ -define(['backbone','./PropertyView', 'Abstract/ui/InputColor'], - function (Backbone, PropertyView, InputColor) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var PropertyView = require('./PropertyView'); + var InputColor = require('Abstract/ui/InputColor'); - return PropertyView.extend({ + module.exports = PropertyView.extend({ renderTemplate: function(){}, @@ -25,4 +28,4 @@ define(['backbone','./PropertyView', 'Abstract/ui/InputColor'], }, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/view/PropertyCompositeView.js b/src/style_manager/view/PropertyCompositeView.js index 71ed64176..94941f8a4 100644 --- a/src/style_manager/view/PropertyCompositeView.js +++ b/src/style_manager/view/PropertyCompositeView.js @@ -1,9 +1,12 @@ -define(['backbone','./PropertyView', 'text!./../templates/propertyComposite.html','require'], - function (Backbone, PropertyView, propertyTemplate, require) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var PropertyView = require('./PropertyView'); + var propertyTemplate = require('text!./../templates/propertyComposite.html'); /** * @class PropertyCompositeView * */ - return PropertyView.extend({ + module.exports = PropertyView.extend({ template: _.template(propertyTemplate), @@ -64,7 +67,7 @@ define(['backbone','./PropertyView', 'text!./../templates/propertyComposite.html getPropsConfig: function(opts){ var that = this; - result = { + var result = { config: this.config, collection: this.props, target: this.target, diff --git a/src/style_manager/view/PropertyFileView.js b/src/style_manager/view/PropertyFileView.js index 22a35d493..4621e26d1 100644 --- a/src/style_manager/view/PropertyFileView.js +++ b/src/style_manager/view/PropertyFileView.js @@ -1,9 +1,12 @@ -define(['backbone','./PropertyView', 'text!./../templates/propertyFile.html'], - function (Backbone, PropertyView, propertyTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var PropertyView = require('./PropertyView'); + var propertyTemplate = require('text!./../templates/propertyFile.html'); /** * @class PropertyColorView * */ - return PropertyView.extend({ + module.exports = PropertyView.extend({ template: _.template(propertyTemplate), @@ -130,4 +133,4 @@ define(['backbone','./PropertyView', 'text!./../templates/propertyFile.html'], }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/view/PropertyIntegerView.js b/src/style_manager/view/PropertyIntegerView.js index 1a4e43a64..5eb471197 100644 --- a/src/style_manager/view/PropertyIntegerView.js +++ b/src/style_manager/view/PropertyIntegerView.js @@ -1,7 +1,10 @@ -define(['backbone','./PropertyView', 'Abstract/ui/InputNumber'], - function (Backbone, PropertyView, InputNumber) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var PropertyView = require('./PropertyView'); + var InputNumber = require('Abstract/ui/InputNumber'); - return PropertyView.extend({ + module.exports = PropertyView.extend({ initialize: function(options) { PropertyView.prototype.initialize.apply(this, arguments); @@ -38,4 +41,4 @@ define(['backbone','./PropertyView', 'Abstract/ui/InputNumber'], }, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/view/PropertyRadioView.js b/src/style_manager/view/PropertyRadioView.js index c415c20ec..fd796fc52 100644 --- a/src/style_manager/view/PropertyRadioView.js +++ b/src/style_manager/view/PropertyRadioView.js @@ -1,9 +1,12 @@ -define(['backbone','./PropertyView', 'text!./../templates/propertyRadio.html'], - function (Backbone, PropertyView, propertyTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var PropertyView = require('./PropertyView'); + var propertyTemplate = require('text!./../templates/propertyRadio.html'); /** * @class PropertyRadioView * */ - return PropertyView.extend({ + module.exports = PropertyView.extend({ template: _.template(propertyTemplate), @@ -27,7 +30,7 @@ define(['backbone','./PropertyView', 'text!./../templates/propertyRadio.html'], var cl = el.className ? el.className + ' ' + pfx + 'icon ' + itemCls : '', id = prop + '-' + el.value, labelTxt = el.name ? el.name : el.value; - titleAttr = el.title ? 'title="' + el.title + '"': ''; + var titleAttr = el.title ? 'title="' + el.title + '"': ''; input += '
'+ ''+ '
'; diff --git a/src/style_manager/view/PropertySelectView.js b/src/style_manager/view/PropertySelectView.js index ec7831b91..5f3193e63 100644 --- a/src/style_manager/view/PropertySelectView.js +++ b/src/style_manager/view/PropertySelectView.js @@ -1,9 +1,12 @@ -define(['backbone','./PropertyView', 'text!./../templates/propertySelect.html'], - function (Backbone, PropertyView, propertyTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var PropertyView = require('./PropertyView'); + var propertyTemplate = require('text!./../templates/propertySelect.html'); /** * @class PropertySelectView * */ - return PropertyView.extend({ + module.exports = PropertyView.extend({ template: _.template(propertyTemplate), @@ -36,4 +39,4 @@ define(['backbone','./PropertyView', 'text!./../templates/propertySelect.html'], }, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js index 4f3796a88..95772fe26 100644 --- a/src/style_manager/view/PropertyStackView.js +++ b/src/style_manager/view/PropertyStackView.js @@ -1,9 +1,14 @@ -define(['backbone','./PropertyCompositeView', 'text!./../templates/propertyStack.html','./../model/Layers','./LayersView'], - function (Backbone, PropertyCompositeView, propertyTemplate, Layers, LayersView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var PropertyCompositeView = require('./PropertyCompositeView'); + var propertyTemplate = require('text!./../templates/propertyStack.html'); + var Layers = require('./../model/Layers'); + var LayersView = require('./LayersView'); /** * @class PropertyStackView * */ - return PropertyCompositeView.extend({ + module.exports = PropertyCompositeView.extend({ template: _.template(propertyTemplate), @@ -320,4 +325,4 @@ define(['backbone','./PropertyCompositeView', 'text!./../templates/propertyStack }, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js index e82a07747..191c3224c 100644 --- a/src/style_manager/view/PropertyView.js +++ b/src/style_manager/view/PropertyView.js @@ -1,9 +1,12 @@ -define(['backbone', 'text!./../templates/propertyLabel.html', 'text!./../templates/propertyInput.html'], - function (Backbone, propertyLabel, propertyTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var propertyLabel = require('text!./../templates/propertyLabel.html'); + var propertyTemplate = require('text!./../templates/propertyInput.html'); /** * @class PropertyView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ template: _.template(propertyTemplate), templateLabel: _.template(propertyLabel), @@ -227,7 +230,7 @@ define(['backbone', 'text!./../templates/propertyLabel.html', 'text!./../templat return; } - value = this.getValueForTarget(); + var value = this.getValueForTarget(); var func = model.get('functionName'); if(func) diff --git a/src/style_manager/view/SectorView.js b/src/style_manager/view/SectorView.js index 4722e2509..da20012cd 100644 --- a/src/style_manager/view/SectorView.js +++ b/src/style_manager/view/SectorView.js @@ -1,9 +1,12 @@ -define(['backbone', './PropertiesView', 'text!./../templates/sector.html'], - function (Backbone, PropertiesView, sectorTemplate) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var PropertiesView = require('./PropertiesView'); + var sectorTemplate = require('text!./../templates/sector.html'); /** * @class SectorView * */ - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ template: _.template(sectorTemplate), @@ -104,4 +107,4 @@ define(['backbone', './PropertiesView', 'text!./../templates/sector.html'], } }, }); -}); +}); \ No newline at end of file diff --git a/src/style_manager/view/SectorsView.js b/src/style_manager/view/SectorsView.js index 43ae12357..5b80cc60f 100644 --- a/src/style_manager/view/SectorsView.js +++ b/src/style_manager/view/SectorsView.js @@ -1,7 +1,9 @@ -define(['backbone', './SectorView'], - function (Backbone, SectorView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var SectorView = require('./SectorView'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ initialize: function(o) { this.config = o.config || {}; @@ -137,4 +139,4 @@ define(['backbone', './SectorView'], return this; } }); -}); +}); \ No newline at end of file diff --git a/src/trait_manager/model/Trait.js b/src/trait_manager/model/Trait.js index 7e95fe336..9c83f7e61 100644 --- a/src/trait_manager/model/Trait.js +++ b/src/trait_manager/model/Trait.js @@ -1,7 +1,8 @@ -define(['backbone'], - function(Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.Model.extend({ + module.exports = Backbone.Model.extend({ defaults: { type: 'text', // text, number, range, select @@ -25,4 +26,4 @@ define(['backbone'], }, }); - }); + }); \ No newline at end of file diff --git a/src/trait_manager/model/TraitFactory.js b/src/trait_manager/model/TraitFactory.js index 0b3c36857..7add794e4 100644 --- a/src/trait_manager/model/TraitFactory.js +++ b/src/trait_manager/model/TraitFactory.js @@ -1,7 +1,8 @@ -define(['backbone'], - function(Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return function() { + module.exports = function() { return { /** @@ -57,4 +58,4 @@ define(['backbone'], }; }(); -}); +}); \ No newline at end of file diff --git a/src/trait_manager/model/Traits.js b/src/trait_manager/model/Traits.js index 5b05769af..b35a0bc78 100644 --- a/src/trait_manager/model/Traits.js +++ b/src/trait_manager/model/Traits.js @@ -1,7 +1,10 @@ -define(['backbone','./Trait', './TraitFactory'], - function (Backbone, Trait, TraitFactory) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var Trait = require('./Trait'); + var TraitFactory = require('./TraitFactory'); - return Backbone.Collection.extend({ + module.exports = Backbone.Collection.extend({ model: Trait, @@ -25,4 +28,4 @@ define(['backbone','./Trait', './TraitFactory'], }, }); -}); +}); \ No newline at end of file diff --git a/src/trait_manager/view/TraitCheckboxView.js b/src/trait_manager/view/TraitCheckboxView.js index a04126457..52627d597 100644 --- a/src/trait_manager/view/TraitCheckboxView.js +++ b/src/trait_manager/view/TraitCheckboxView.js @@ -1,7 +1,8 @@ -define(['./TraitView'], - function (TraitView) { +define(function(require, exports, module){ + 'use strict'; + var TraitView = require('./TraitView'); - return TraitView.extend({ + module.exports = TraitView.extend({ initialize: function(o) { TraitView.prototype.initialize.apply(this, arguments); @@ -42,4 +43,4 @@ define(['./TraitView'], }, }); -}); +}); \ No newline at end of file diff --git a/src/trait_manager/view/TraitColorView.js b/src/trait_manager/view/TraitColorView.js index ca216d070..49ef76e07 100644 --- a/src/trait_manager/view/TraitColorView.js +++ b/src/trait_manager/view/TraitColorView.js @@ -1,7 +1,9 @@ -define(['./TraitView', 'Abstract/ui/InputColor'], - function (TraitView, InputColor) { +define(function(require, exports, module){ + 'use strict'; + var TraitView = require('./TraitView'); + var InputColor = require('Abstract/ui/InputColor'); - return TraitView.extend({ + module.exports = TraitView.extend({ /** * Returns input element * @return {HTMLElement} @@ -35,4 +37,4 @@ define(['./TraitView', 'Abstract/ui/InputColor'], }, }); -}); +}); \ No newline at end of file diff --git a/src/trait_manager/view/TraitNumberView.js b/src/trait_manager/view/TraitNumberView.js index 765e2d7da..9b1a0feca 100644 --- a/src/trait_manager/view/TraitNumberView.js +++ b/src/trait_manager/view/TraitNumberView.js @@ -1,7 +1,9 @@ -define(['./TraitView', 'Abstract/ui/InputNumber'], - function (TraitView, InputNumber) { +define(function(require, exports, module){ + 'use strict'; + var TraitView = require('./TraitView'); + var InputNumber = require('Abstract/ui/InputNumber'); - return TraitView.extend({ + module.exports = TraitView.extend({ getValueForTarget: function () { var model = this.model; @@ -45,4 +47,4 @@ define(['./TraitView', 'Abstract/ui/InputNumber'], }, }); -}); +}); \ No newline at end of file diff --git a/src/trait_manager/view/TraitSelectView.js b/src/trait_manager/view/TraitSelectView.js index d2499caa9..7100d170d 100644 --- a/src/trait_manager/view/TraitSelectView.js +++ b/src/trait_manager/view/TraitSelectView.js @@ -1,7 +1,9 @@ -define(['backbone','./TraitView'], - function (Backbone, TraitView) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); + var TraitView = require('./TraitView'); - return TraitView.extend({ + module.exports = TraitView.extend({ initialize: function(o) { TraitView.prototype.initialize.apply(this, arguments); @@ -61,4 +63,4 @@ define(['backbone','./TraitView'], }, }); -}); +}); \ No newline at end of file diff --git a/src/trait_manager/view/TraitView.js b/src/trait_manager/view/TraitView.js index e6e0f2a5f..d2f0507c7 100644 --- a/src/trait_manager/view/TraitView.js +++ b/src/trait_manager/view/TraitView.js @@ -1,6 +1,8 @@ -define(['backbone'], function (Backbone) { +define(function(require, exports, module){ + 'use strict'; + var Backbone = require('backbone'); - return Backbone.View.extend({ + module.exports = Backbone.View.extend({ events:{ 'change': 'onChange' @@ -137,4 +139,4 @@ define(['backbone'], function (Backbone) { }); -}); +}); \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index d63be1012..449399fcc 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,4 +1,5 @@ //webpack --display-reasons +var webpack = require('webpack'); var name = 'grapesjs'; module.exports = { @@ -8,6 +9,11 @@ module.exports = { library: name, libraryTarget: 'umd', }, + plugins: [ + new webpack.ProvidePlugin({ + $: 'jquery', + }) + ], resolve: { modulesDirectories: ['src', 'node_modules'], alias: {