diff --git a/package.json b/package.json index 9e17df5e6..c74415270 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "url": "https://github.com/artf/grapesjs.git" }, "dependencies": { - "amd-to-common": "^1.1.1", "backbone": "^1.3.3", "backbone-undo": "^0.2.5", "codemirror": "^5.21.0", @@ -20,10 +19,7 @@ "jquery": "^3.1.1", "keymaster": "^1.6.2", "spectrum-colorpicker": "^1.8.0", - "text-loader": "^0.0.1", - "underscore": "^1.8.3", - "webpack": "^1.13.1", - "webpack-dev-server": "^1.14.1" + "underscore": "^1.8.3" }, "devDependencies": { "babel-core": "^6.24.1", @@ -36,13 +32,13 @@ "jsdom": "^11.0.0", "mocha": "^3.1.2", "node-sass": "^3.4.2", - "requirejs": "^2.3.2", - "requirejs-text": "^2.0.12", "sinon": "^1.17.6", "svg2ttf": "^4.0.1", "ttf2eot": "^2.0.0", "ttf2woff": "^2.0.1", - "ttf2woff2": "^2.0.3" + "ttf2woff2": "^2.0.3", + "webpack": "^1.13.1", + "webpack-dev-server": "^1.14.1" }, "keywords": [ "wte", diff --git a/src/code_manager/template/editor.html b/src/code_manager/template/editor.html deleted file mode 100644 index f8148afbd..000000000 --- a/src/code_manager/template/editor.html +++ /dev/null @@ -1,4 +0,0 @@ -
-
<%= label %>
-
-
diff --git a/src/code_manager/view/EditorView.js b/src/code_manager/view/EditorView.js index 9ba5967c1..a98eb5116 100644 --- a/src/code_manager/view/EditorView.js +++ b/src/code_manager/view/EditorView.js @@ -1,9 +1,12 @@ var Backbone = require('backbone'); -var vTemplate = require('text!./../template/editor.html'); module.exports = Backbone.View.extend({ - template: _.template(vTemplate), + template: _.template(` +
+
<%= label %>
+
+
`), initialize: function(o){ this.config = o.config || {}; diff --git a/src/config/require-config.js b/src/config/require-config.js deleted file mode 100644 index 82054f079..000000000 --- a/src/config/require-config.js +++ /dev/null @@ -1,59 +0,0 @@ -require.config({ - shim: { - underscore: { - exports: '_' - }, - backbone: { - deps: [ 'underscore', 'jquery' ], - exports: 'Backbone' - }, - rte: { - deps: [ 'jquery' ], - exports: 'rte' - }, - backboneUndo: { - deps: ['backbone'], - exports: 'backboneUndo' - }, - keymaster: { - exports: 'keymaster' - }, - }, - - paths: { - jquery: '../node_modules/jquery/dist/jquery', - underscore: '../node_modules/underscore/underscore', - backbone: '../node_modules/backbone/backbone', - backboneUndo: '../node_modules/backbone-undo/Backbone.Undo', - keymaster: '../node_modules/keymaster/keymaster', - text: '../node_modules/requirejs-text/text', - Spectrum: '../node_modules/spectrum-colorpicker/spectrum', - codemirror: '../node_modules/codemirror', - formatting: '../node_modules/codemirror-formatting/formatting', - }, - - packages : [ - { name: 'GrapesJS', location: 'grapesjs' }, - { name: 'Abstract', location: 'domain_abstract' }, - { name: 'Editor', location: 'editor', }, - { name: 'AssetManager', location: 'asset_manager', }, - { name: 'BlockManager', location: 'block_manager', }, - { name: 'TraitManager', location: 'trait_manager', }, - { name: 'StyleManager', location: 'style_manager', }, - { name: 'DeviceManager', location: 'device_manager', }, - { name: 'StorageManager', location: 'storage_manager', }, - { name: 'PluginManager', location: 'plugin_manager', }, - { name: 'Navigator', location: 'navigator', }, - { name: 'DomComponents', location: 'dom_components', }, - { name: 'RichTextEditor', location: 'rich_text_editor', }, - { name: 'SelectorManager', location: 'selector_manager', }, - { name: 'ModalDialog', location: 'modal_dialog', }, - { name: 'CodeManager', location: 'code_manager', }, - { name: 'CssComposer', location: 'css_composer', }, - { name: 'Commands', location: 'commands', }, - { name: 'Canvas', location: 'canvas', }, - { name: 'Panels', location: 'panels', }, - { name: 'Parser', location: 'parser', }, - { name: 'Utils', location: 'utils', } - ] -}); diff --git a/src/device_manager/template/devices.html b/src/device_manager/template/devices.html deleted file mode 100644 index effb8781a..000000000 --- a/src/device_manager/template/devices.html +++ /dev/null @@ -1,10 +0,0 @@ -
<%= deviceLabel %>
-
- - - -
-
-
-
- \ No newline at end of file diff --git a/src/device_manager/view/DevicesView.js b/src/device_manager/view/DevicesView.js index 0c913e31c..2b2543dd8 100644 --- a/src/device_manager/view/DevicesView.js +++ b/src/device_manager/view/DevicesView.js @@ -1,9 +1,18 @@ var Backbone = require('backbone'); -var devicesTemplate = require('text!./../template/devices.html'); module.exports = Backbone.View.extend({ - template: _.template(devicesTemplate), + template: _.template(` +
<%= deviceLabel %>
+
+ + + +
+
+
+
+ `), events: { 'change': 'updateDevice' diff --git a/src/domain_abstract/ui/Input.js b/src/domain_abstract/ui/Input.js index dac37daa8..ccb6b3760 100644 --- a/src/domain_abstract/ui/Input.js +++ b/src/domain_abstract/ui/Input.js @@ -1,5 +1,4 @@ var Backbone = require('backbone'); -var inputTemplate = require('text!./templates/input.html'); module.exports = Backbone.View.extend({ @@ -7,7 +6,7 @@ module.exports = Backbone.View.extend({ 'change': 'handleChange', }, - template: _.template(inputTemplate), + template: _.template(``), initialize: function(opts) { var opt = opts || {}; diff --git a/src/domain_abstract/ui/InputColor.js b/src/domain_abstract/ui/InputColor.js index 852dfe1a8..762544f7c 100644 --- a/src/domain_abstract/ui/InputColor.js +++ b/src/domain_abstract/ui/InputColor.js @@ -1,11 +1,16 @@ var Backbone = require('backbone'); var Input = require('./Input'); var Spectrum = require('Spectrum'); -var inputTemplate = require('text!./templates/inputColor.html'); module.exports = Input.extend({ - template: _.template(inputTemplate), + template: _.template(` +
+
+
+
+
+
`), initialize: function(opts) { Input.prototype.initialize.apply(this, arguments); diff --git a/src/domain_abstract/ui/InputNumber.js b/src/domain_abstract/ui/InputNumber.js index 5d8b6c92a..1ff293e79 100644 --- a/src/domain_abstract/ui/InputNumber.js +++ b/src/domain_abstract/ui/InputNumber.js @@ -1,11 +1,16 @@ var Backbone = require('backbone'); -var inputTemplate = require('text!./templates/inputNumber.html'); module.exports = Backbone.View.extend({ events: {}, - template: _.template(inputTemplate), + template: _.template(` + + +
+
+
+
`), initialize: function(opts) { _.bindAll(this, 'moveIncrement', 'upIncrement'); diff --git a/src/domain_abstract/ui/templates/input.html b/src/domain_abstract/ui/templates/input.html deleted file mode 100644 index 03f3bd7d6..000000000 --- a/src/domain_abstract/ui/templates/input.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/domain_abstract/ui/templates/inputColor.html b/src/domain_abstract/ui/templates/inputColor.html deleted file mode 100644 index 7886de64f..000000000 --- a/src/domain_abstract/ui/templates/inputColor.html +++ /dev/null @@ -1,6 +0,0 @@ -
-
-
-
-
-
diff --git a/src/domain_abstract/ui/templates/inputNumber.html b/src/domain_abstract/ui/templates/inputNumber.html deleted file mode 100644 index 405f3406c..000000000 --- a/src/domain_abstract/ui/templates/inputNumber.html +++ /dev/null @@ -1,6 +0,0 @@ - - -
-
-
-
diff --git a/src/modal_dialog/template/modal.html b/src/modal_dialog/template/modal.html deleted file mode 100644 index daa1b792c..000000000 --- a/src/modal_dialog/template/modal.html +++ /dev/null @@ -1,12 +0,0 @@ -
-
-
<%= title %>
-
⨯
-
-
-
<%= content %>
-
-
-
-
- diff --git a/src/modal_dialog/view/ModalView.js b/src/modal_dialog/view/ModalView.js index 4df04e6a4..132bf4977 100644 --- a/src/modal_dialog/view/ModalView.js +++ b/src/modal_dialog/view/ModalView.js @@ -1,8 +1,19 @@ var Backbone = require('backbone'); -var modalTemplate = require('text!./../template/modal.html'); -module.exports = Backbone.View.extend({ - template: _.template(modalTemplate), +module.exports = Backbone.View.extend({ + template: _.template(` +
+
+
<%= title %>
+
⨯
+
+
+
<%= content %>
+
+
+
+
+ `), events: {}, diff --git a/src/navigator/template/item.html b/src/navigator/template/item.html deleted file mode 100644 index b35eca08b..000000000 --- a/src/navigator/template/item.html +++ /dev/null @@ -1,19 +0,0 @@ -<% if (hidable) { %> - -<% } %> - -
-
- - - -
-
- -
<%= (count ? count : '') %>
- -
- -
- -
diff --git a/src/navigator/view/ItemView.js b/src/navigator/view/ItemView.js index 3adf60976..e500c64cd 100644 --- a/src/navigator/view/ItemView.js +++ b/src/navigator/view/ItemView.js @@ -1,10 +1,28 @@ var Backbone = require('backbone'); -var ItemTemplate = require('text!./../template/item.html'); var ItemsView; module.exports = Backbone.View.extend({ - template: _.template(ItemTemplate), + template: _.template(` + <% if (hidable) { %> + + <% } %> + +
+
+ + + +
+
+ +
<%= (count ? count : '') %>
+ +
+ +
+ +
`), initialize: function(o) { this.opt = o; diff --git a/src/selector_manager/template/classTag.html b/src/selector_manager/template/classTag.html deleted file mode 100644 index 39d01f543..000000000 --- a/src/selector_manager/template/classTag.html +++ /dev/null @@ -1,5 +0,0 @@ - - - /> - -⨯ \ No newline at end of file diff --git a/src/selector_manager/template/classTags.html b/src/selector_manager/template/classTags.html deleted file mode 100644 index 7905f16d2..000000000 --- a/src/selector_manager/template/classTags.html +++ /dev/null @@ -1,27 +0,0 @@ -
-
<%= label %>
-
- -
- - - -
-
-
-
- -
-
-
-
- - -
-
-
Selected
-
-
-
diff --git a/src/selector_manager/view/ClassTagView.js b/src/selector_manager/view/ClassTagView.js index bd3b99673..acabb7cf9 100644 --- a/src/selector_manager/view/ClassTagView.js +++ b/src/selector_manager/view/ClassTagView.js @@ -1,8 +1,12 @@ var Backbone = require('backbone'); -var tagTemplate = require('text!./../template/classTag.html'); -module.exports = Backbone.View.extend({ - template: _.template(tagTemplate), +module.exports = Backbone.View.extend({ + template: _.template(` + + + /> + + ⨯`), events: {}, diff --git a/src/selector_manager/view/ClassTagsView.js b/src/selector_manager/view/ClassTagsView.js index 53432faaa..54b0ec3af 100644 --- a/src/selector_manager/view/ClassTagsView.js +++ b/src/selector_manager/view/ClassTagsView.js @@ -1,10 +1,35 @@ var Backbone = require('backbone'); -var tagsTemplate = require('text!./../template/classTags.html'); var ClassTagView = require('./ClassTagView'); module.exports = Backbone.View.extend({ - - template: _.template(tagsTemplate), + template: _.template(` +
+
<%= label %>
+
+ +
+ + + +
+
+
+
+ +
+
+
+
+ + +
+
+
Selected
+
+
+
`), events: {}, diff --git a/src/style_manager/templates/layer.html b/src/style_manager/templates/layer.html deleted file mode 100644 index e045fb7ac..000000000 --- a/src/style_manager/templates/layer.html +++ /dev/null @@ -1,10 +0,0 @@ -
- -
-
<%= label %>
-
-
-
-
⨯
-
-
\ No newline at end of file diff --git a/src/style_manager/templates/propertyColor.html b/src/style_manager/templates/propertyColor.html deleted file mode 100644 index bccdeae08..000000000 --- a/src/style_manager/templates/propertyColor.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
-
-
-
-
-
-
-
diff --git a/src/style_manager/templates/propertyComposite.html b/src/style_manager/templates/propertyComposite.html deleted file mode 100644 index 44ec6cf33..000000000 --- a/src/style_manager/templates/propertyComposite.html +++ /dev/null @@ -1,4 +0,0 @@ -
- -
-
\ No newline at end of file diff --git a/src/style_manager/templates/propertyFile.html b/src/style_manager/templates/propertyFile.html deleted file mode 100644 index 001ce580c..000000000 --- a/src/style_manager/templates/propertyFile.html +++ /dev/null @@ -1,13 +0,0 @@ -
-
-
- -
-
-
-
-
-
⨯
-
-
-
\ No newline at end of file diff --git a/src/style_manager/templates/propertyInput.html b/src/style_manager/templates/propertyInput.html deleted file mode 100644 index 7277ecdaf..000000000 --- a/src/style_manager/templates/propertyInput.html +++ /dev/null @@ -1,4 +0,0 @@ -
- -
-
diff --git a/src/style_manager/templates/propertyInteger.html b/src/style_manager/templates/propertyInteger.html deleted file mode 100644 index 0a3260c5f..000000000 --- a/src/style_manager/templates/propertyInteger.html +++ /dev/null @@ -1,8 +0,0 @@ -
- - -
-
-
-
-
diff --git a/src/style_manager/templates/propertyLabel.html b/src/style_manager/templates/propertyLabel.html deleted file mode 100644 index 2225aa638..000000000 --- a/src/style_manager/templates/propertyLabel.html +++ /dev/null @@ -1,5 +0,0 @@ -
-
- <%= label %> -
-
\ No newline at end of file diff --git a/src/style_manager/templates/propertyRadio.html b/src/style_manager/templates/propertyRadio.html deleted file mode 100644 index 2a7ba9cb1..000000000 --- a/src/style_manager/templates/propertyRadio.html +++ /dev/null @@ -1,4 +0,0 @@ -
- -
-
diff --git a/src/style_manager/templates/propertySelect.html b/src/style_manager/templates/propertySelect.html deleted file mode 100644 index aac26216a..000000000 --- a/src/style_manager/templates/propertySelect.html +++ /dev/null @@ -1,7 +0,0 @@ -
- -
-
-
-
-
diff --git a/src/style_manager/templates/propertyStack.html b/src/style_manager/templates/propertyStack.html deleted file mode 100644 index 1f09dc6d5..000000000 --- a/src/style_manager/templates/propertyStack.html +++ /dev/null @@ -1,5 +0,0 @@ -
- - -
-
\ No newline at end of file diff --git a/src/style_manager/templates/sector.html b/src/style_manager/templates/sector.html deleted file mode 100644 index 0f98ee438..000000000 --- a/src/style_manager/templates/sector.html +++ /dev/null @@ -1,4 +0,0 @@ -
- - <%= label %> -
\ No newline at end of file diff --git a/src/style_manager/view/LayerView.js b/src/style_manager/view/LayerView.js index 3bd7ea1b1..8ccb3868a 100644 --- a/src/style_manager/view/LayerView.js +++ b/src/style_manager/view/LayerView.js @@ -1,5 +1,4 @@ var Backbone = require('backbone'); -var layerTemplate = require('text!./../templates/layer.html'); module.exports = Backbone.View.extend({ @@ -7,7 +6,17 @@ module.exports = Backbone.View.extend({ 'click': 'updateIndex', }, - template: _.template(layerTemplate), + template: _.template(` +
+ +
+
<%= label %>
+
+
+
+
⨯
+
+
`), initialize: function(o) { this.stackModel = o.stackModel || {}; diff --git a/src/style_manager/view/PropertyCompositeView.js b/src/style_manager/view/PropertyCompositeView.js index cf214e7b7..effe00bfb 100644 --- a/src/style_manager/view/PropertyCompositeView.js +++ b/src/style_manager/view/PropertyCompositeView.js @@ -1,10 +1,13 @@ var Backbone = require('backbone'); var PropertyView = require('./PropertyView'); -var propertyTemplate = require('text!./../templates/propertyComposite.html'); module.exports = PropertyView.extend({ - template: _.template(propertyTemplate), + template: _.template(` +
+ +
+
`), initialize: function(o) { PropertyView.prototype.initialize.apply(this, arguments); diff --git a/src/style_manager/view/PropertyFileView.js b/src/style_manager/view/PropertyFileView.js index e3f52894d..8c140b3b5 100644 --- a/src/style_manager/view/PropertyFileView.js +++ b/src/style_manager/view/PropertyFileView.js @@ -1,10 +1,20 @@ var Backbone = require('backbone'); var PropertyView = require('./PropertyView'); -var propertyTemplate = require('text!./../templates/propertyFile.html'); module.exports = PropertyView.extend({ - - template: _.template(propertyTemplate), + template: _.template(`
+
+
+ +
+
+
+
+
+
⨯
+
+
+
`), initialize: function(options) { PropertyView.prototype.initialize.apply(this, arguments); diff --git a/src/style_manager/view/PropertyRadioView.js b/src/style_manager/view/PropertyRadioView.js index 3b149b750..560016de0 100644 --- a/src/style_manager/view/PropertyRadioView.js +++ b/src/style_manager/view/PropertyRadioView.js @@ -1,10 +1,13 @@ var Backbone = require('backbone'); var PropertyView = require('./PropertyView'); -var propertyTemplate = require('text!./../templates/propertyRadio.html'); module.exports = PropertyView.extend({ - template: _.template(propertyTemplate), + template: _.template(` +
+ +
+
`), initialize: function(options) { PropertyView.prototype.initialize.apply(this, arguments); diff --git a/src/style_manager/view/PropertySelectView.js b/src/style_manager/view/PropertySelectView.js index 4dbeb3996..6a7fc40fd 100644 --- a/src/style_manager/view/PropertySelectView.js +++ b/src/style_manager/view/PropertySelectView.js @@ -1,10 +1,16 @@ var Backbone = require('backbone'); var PropertyView = require('./PropertyView'); -var propertyTemplate = require('text!./../templates/propertySelect.html'); module.exports = PropertyView.extend({ - template: _.template(propertyTemplate), + template: _.template(` +
+ +
+
+
+
+
`), initialize: function(options) { PropertyView.prototype.initialize.apply(this, arguments); diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js index 1cd44eb93..6926aa0be 100644 --- a/src/style_manager/view/PropertyStackView.js +++ b/src/style_manager/view/PropertyStackView.js @@ -1,12 +1,16 @@ var Backbone = require('backbone'); var PropertyCompositeView = require('./PropertyCompositeView'); -var propertyTemplate = require('text!./../templates/propertyStack.html'); var Layers = require('./../model/Layers'); var LayersView = require('./LayersView'); module.exports = PropertyCompositeView.extend({ - template: _.template(propertyTemplate), + template: _.template(` +
+ + +
+
`), initialize: function(o) { PropertyCompositeView.prototype.initialize.apply(this, arguments); diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js index 7cdd8553e..978ce9d71 100644 --- a/src/style_manager/view/PropertyView.js +++ b/src/style_manager/view/PropertyView.js @@ -1,11 +1,18 @@ var Backbone = require('backbone'); -var propertyLabel = require('text!./../templates/propertyLabel.html'); -var propertyTemplate = require('text!./../templates/propertyInput.html'); module.exports = Backbone.View.extend({ - - template: _.template(propertyTemplate), - templateLabel: _.template(propertyLabel), + template: _.template(` +
+ +
+
`), + + templateLabel: _.template(` +
+
+ <%= label %> +
+
`), events: {'change': 'valueUpdated'}, diff --git a/src/style_manager/view/SectorView.js b/src/style_manager/view/SectorView.js index 1f14c5a5a..3c7aadb9b 100644 --- a/src/style_manager/view/SectorView.js +++ b/src/style_manager/view/SectorView.js @@ -1,10 +1,13 @@ var Backbone = require('backbone'); var PropertiesView = require('./PropertiesView'); -var sectorTemplate = require('text!./../templates/sector.html'); module.exports = Backbone.View.extend({ - template: _.template(sectorTemplate), + template: _.template(` +
+ + <%= label %> +
`), events:{},