diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js index 1a1d611cd..cc668643c 100644 --- a/src/canvas/view/CanvasView.js +++ b/src/canvas/view/CanvasView.js @@ -326,7 +326,7 @@ module.exports = Backbone.View.extend({ */ getJsContainer() { if (!this.jsContainer) { - this.jsContainer = $('
', {class: this.ppfx + 'js-cont'}).get(0); + this.jsContainer = $(`
`).get(0); } return this.jsContainer; }, diff --git a/src/commands/view/ExportTemplate.js b/src/commands/view/ExportTemplate.js index 00d152ae9..d8a8ab597 100644 --- a/src/commands/view/ExportTemplate.js +++ b/src/commands/view/ExportTemplate.js @@ -50,7 +50,7 @@ module.exports = { var oCsslEd = this.buildEditor('css', 'hopscotch', 'CSS'); this.htmlEditor = oHtmlEd.el; this.cssEditor = oCsslEd.el; - this.$editors = $('
', {class: this.pfx + 'export-dl'}); + this.$editors = $(`
`); this.$editors.append(oHtmlEd.$el).append(oCsslEd.$el); } diff --git a/src/commands/view/OpenStyleManager.js b/src/commands/view/OpenStyleManager.js index 52c25c695..b9c273292 100644 --- a/src/commands/view/OpenStyleManager.js +++ b/src/commands/view/OpenStyleManager.js @@ -27,12 +27,9 @@ module.exports = { this.$cn2.append(em.StyleManager.render()); var smConfig = em.StyleManager.getConfig(); + const pfx = smConfig.stylePrefix; // Create header - this.$header = $('
', { - class: smConfig.stylePrefix + 'header', - text: smConfig.textNoElement, - }); - //this.$cn = this.$cn.add(this.$header); + this.$header = $(`
${smConfig.textNoElement}
`); this.$cn.append(this.$header); // Create panel if not exists diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js index 79381416f..7ce790022 100644 --- a/src/commands/view/SelectComponent.js +++ b/src/commands/view/SelectComponent.js @@ -1,7 +1,7 @@ -var ToolbarView = require('dom_components/view/ToolbarView'); -var Toolbar = require('dom_components/model/Toolbar'); -var key = require('keymaster'); -var Backbone = require('backbone'); +const ToolbarView = require('dom_components/view/ToolbarView'); +const Toolbar = require('dom_components/model/Toolbar'); +const key = require('keymaster'); +const Backbone = require('backbone'); let showOffsets; const $ = Backbone.$; diff --git a/src/commands/view/ShowOffset.js b/src/commands/view/ShowOffset.js index f818626d2..2ec5a7c61 100644 --- a/src/commands/view/ShowOffset.js +++ b/src/commands/view/ShowOffset.js @@ -40,8 +40,8 @@ module.exports = { var stateLow = state.toLowerCase(); var marginName = stateLow + 'margin-v'; var paddingName = stateLow + 'padding-v'; - var marginV = $('
', {class: ppfx + marginName}).get(0); - var paddingV = $('
', {class: ppfx + paddingName}).get(0); + var marginV = $(`
`).get(0); + var paddingV = $(`
`).get(0); var marginEls = ppfx + marginName + '-el'; var paddingEls = ppfx + paddingName + '-el'; const fullMargName = `${marginEls} ${ppfx + marginName}`; diff --git a/src/domain_abstract/ui/Input.js b/src/domain_abstract/ui/Input.js index 4b382639d..c5f92dc32 100644 --- a/src/domain_abstract/ui/Input.js +++ b/src/domain_abstract/ui/Input.js @@ -58,11 +58,9 @@ module.exports = Backbone.View.extend({ */ getInputEl() { if(!this.inputEl) { - this.inputEl = $('', { - type: 'text', - class: this.inputCls, - placeholder: this.model.get('defaults') - }); + const plh = this.model.get('defaults'); + const cls = this.inputCls; + this.inputEl = $(``); } return this.inputEl.get(0); }, diff --git a/src/domain_abstract/ui/InputColor.js b/src/domain_abstract/ui/InputColor.js index a63830c4f..351584148 100644 --- a/src/domain_abstract/ui/InputColor.js +++ b/src/domain_abstract/ui/InputColor.js @@ -57,7 +57,7 @@ module.exports = Input.extend({ const self = this; var model = this.model; - var colorEl = $('
', {class: this.colorCls}); + var colorEl = $(`
`); var cpStyle = colorEl.get(0).style; var elToAppend = this.target && this.target.config ? this.target.config.el : ''; diff --git a/src/domain_abstract/ui/InputNumber.js b/src/domain_abstract/ui/InputNumber.js index 5b4aabfe7..733ce9794 100644 --- a/src/domain_abstract/ui/InputNumber.js +++ b/src/domain_abstract/ui/InputNumber.js @@ -101,11 +101,9 @@ module.exports = Backbone.View.extend({ */ getInputEl() { if(!this.inputEl) { - this.inputEl = $('', { - type: 'text', - class: this.inputCls, - placeholder: this.model.get('defaults') - }); + const cls = this.inputCls; + const plh = this.model.get('defaults'); + this.inputEl = $(``); } return this.inputEl.get(0); }, diff --git a/src/style_manager/view/PropertyCompositeView.js b/src/style_manager/view/PropertyCompositeView.js index 2cd4a0eda..2f5f46a64 100644 --- a/src/style_manager/view/PropertyCompositeView.js +++ b/src/style_manager/view/PropertyCompositeView.js @@ -26,7 +26,7 @@ module.exports = PropertyView.extend({ if (props.length) { if (!this.$input) { - this.$input = $('', {value: 0, type: 'hidden' }); + this.$input = $(''); this.input = this.$input.get(0); } diff --git a/src/style_manager/view/PropertyFileView.js b/src/style_manager/view/PropertyFileView.js index ced75d896..8e8f30a43 100644 --- a/src/style_manager/view/PropertyFileView.js +++ b/src/style_manager/view/PropertyFileView.js @@ -36,7 +36,8 @@ module.exports = PropertyView.extend({ onRender() { if (!this.$input) { - this.$input = $('', {placeholder: this.model.getDefaultValue(), type: 'text' }); + const plh = this.model.getDefaultValue(); + this.$input = $(``); } if (!this.$preview) { diff --git a/src/trait_manager/view/TraitView.js b/src/trait_manager/view/TraitView.js index dd35f65f8..727e70cf1 100644 --- a/src/trait_manager/view/TraitView.js +++ b/src/trait_manager/view/TraitView.js @@ -81,21 +81,24 @@ module.exports = Backbone.View.extend({ var md = this.model; var trg = this.target; var name = md.get('name'); - var opts = { - placeholder: md.get('placeholder') || md.get('default'), - type: md.get('type') || 'text' - }; - if(md.get('changeProp')){ - opts.value = trg.get(name); - }else{ - var attrs = trg.get('attributes'); - opts.value = md.get('value') || attrs[name]; + const plh = md.get('placeholder') || md.get('default'); + const type = md.get('type') || 'text'; + const attrs = trg.get('attributes'); + const min = md.get('min'); + const max = md.get('max'); + const value = md.get('changeProp') ? + trg.get(name) : md.get('value') || attrs[name]; + const input = $(``); + + if (min) { + input.prop('min', min); + } + + if (max) { + input.prop('max', max); } - if(md.get('min')) - opts.min = md.get('min'); - if(md.get('max')) - opts.max = md.get('max'); - this.$input = $('', opts); + + this.$input = input; } return this.$input.get(0); }, diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js index 877ebf3ae..72e59396e 100644 --- a/src/utils/Sorter.js +++ b/src/utils/Sorter.js @@ -1,4 +1,5 @@ -var Backbone = require('backbone'); +const Backbone = require('backbone'); +const $ = Backbone.$; module.exports = Backbone.View.extend({