Browse Source

Remove some not compatible jquery method

no-jquery
Artur Arseniev 9 years ago
parent
commit
5abc6fd5d3
  1. 2
      src/canvas/view/CanvasView.js
  2. 2
      src/commands/view/ExportTemplate.js
  3. 7
      src/commands/view/OpenStyleManager.js
  4. 8
      src/commands/view/SelectComponent.js
  5. 4
      src/commands/view/ShowOffset.js
  6. 8
      src/domain_abstract/ui/Input.js
  7. 2
      src/domain_abstract/ui/InputColor.js
  8. 8
      src/domain_abstract/ui/InputNumber.js
  9. 2
      src/style_manager/view/PropertyCompositeView.js
  10. 3
      src/style_manager/view/PropertyFileView.js
  11. 31
      src/trait_manager/view/TraitView.js
  12. 3
      src/utils/Sorter.js

2
src/canvas/view/CanvasView.js

@ -326,7 +326,7 @@ module.exports = Backbone.View.extend({
*/ */
getJsContainer() { getJsContainer() {
if (!this.jsContainer) { if (!this.jsContainer) {
this.jsContainer = $('<div>', {class: this.ppfx + 'js-cont'}).get(0); this.jsContainer = $(`<div class="${this.ppfx}js-cont">`).get(0);
} }
return this.jsContainer; return this.jsContainer;
}, },

2
src/commands/view/ExportTemplate.js

@ -50,7 +50,7 @@ module.exports = {
var oCsslEd = this.buildEditor('css', 'hopscotch', 'CSS'); var oCsslEd = this.buildEditor('css', 'hopscotch', 'CSS');
this.htmlEditor = oHtmlEd.el; this.htmlEditor = oHtmlEd.el;
this.cssEditor = oCsslEd.el; this.cssEditor = oCsslEd.el;
this.$editors = $('<div>', {class: this.pfx + 'export-dl'}); this.$editors = $(`<div class="${this.pfx}export-dl">`);
this.$editors.append(oHtmlEd.$el).append(oCsslEd.$el); this.$editors.append(oHtmlEd.$el).append(oCsslEd.$el);
} }

7
src/commands/view/OpenStyleManager.js

@ -27,12 +27,9 @@ module.exports = {
this.$cn2.append(em.StyleManager.render()); this.$cn2.append(em.StyleManager.render());
var smConfig = em.StyleManager.getConfig(); var smConfig = em.StyleManager.getConfig();
const pfx = smConfig.stylePrefix;
// Create header // Create header
this.$header = $('<div>', { this.$header = $(`<div class="${pfx}header">${smConfig.textNoElement}</div>`);
class: smConfig.stylePrefix + 'header',
text: smConfig.textNoElement,
});
//this.$cn = this.$cn.add(this.$header);
this.$cn.append(this.$header); this.$cn.append(this.$header);
// Create panel if not exists // Create panel if not exists

8
src/commands/view/SelectComponent.js

@ -1,7 +1,7 @@
var ToolbarView = require('dom_components/view/ToolbarView'); const ToolbarView = require('dom_components/view/ToolbarView');
var Toolbar = require('dom_components/model/Toolbar'); const Toolbar = require('dom_components/model/Toolbar');
var key = require('keymaster'); const key = require('keymaster');
var Backbone = require('backbone'); const Backbone = require('backbone');
let showOffsets; let showOffsets;
const $ = Backbone.$; const $ = Backbone.$;

4
src/commands/view/ShowOffset.js

@ -40,8 +40,8 @@ module.exports = {
var stateLow = state.toLowerCase(); var stateLow = state.toLowerCase();
var marginName = stateLow + 'margin-v'; var marginName = stateLow + 'margin-v';
var paddingName = stateLow + 'padding-v'; var paddingName = stateLow + 'padding-v';
var marginV = $('<div>', {class: ppfx + marginName}).get(0); var marginV = $(`<div class="${ppfx}marginName">`).get(0);
var paddingV = $('<div>', {class: ppfx + paddingName}).get(0); var paddingV = $(`<div class="${ppfx}paddingName">`).get(0);
var marginEls = ppfx + marginName + '-el'; var marginEls = ppfx + marginName + '-el';
var paddingEls = ppfx + paddingName + '-el'; var paddingEls = ppfx + paddingName + '-el';
const fullMargName = `${marginEls} ${ppfx + marginName}`; const fullMargName = `${marginEls} ${ppfx + marginName}`;

8
src/domain_abstract/ui/Input.js

@ -58,11 +58,9 @@ module.exports = Backbone.View.extend({
*/ */
getInputEl() { getInputEl() {
if(!this.inputEl) { if(!this.inputEl) {
this.inputEl = $('<input>', { const plh = this.model.get('defaults');
type: 'text', const cls = this.inputCls;
class: this.inputCls, this.inputEl = $(`<input type="text" class="${cls}" placeholder="${plh}">`);
placeholder: this.model.get('defaults')
});
} }
return this.inputEl.get(0); return this.inputEl.get(0);
}, },

2
src/domain_abstract/ui/InputColor.js

@ -57,7 +57,7 @@ module.exports = Input.extend({
const self = this; const self = this;
var model = this.model; var model = this.model;
var colorEl = $('<div>', {class: this.colorCls}); var colorEl = $(`<div class="${this.colorCls}">`);
var cpStyle = colorEl.get(0).style; var cpStyle = colorEl.get(0).style;
var elToAppend = this.target && this.target.config ? this.target.config.el : ''; var elToAppend = this.target && this.target.config ? this.target.config.el : '';

8
src/domain_abstract/ui/InputNumber.js

@ -101,11 +101,9 @@ module.exports = Backbone.View.extend({
*/ */
getInputEl() { getInputEl() {
if(!this.inputEl) { if(!this.inputEl) {
this.inputEl = $('<input>', { const cls = this.inputCls;
type: 'text', const plh = this.model.get('defaults');
class: this.inputCls, this.inputEl = $(`<input type="text" class="${cls}" placeholder="${plh}">`);
placeholder: this.model.get('defaults')
});
} }
return this.inputEl.get(0); return this.inputEl.get(0);
}, },

2
src/style_manager/view/PropertyCompositeView.js

@ -26,7 +26,7 @@ module.exports = PropertyView.extend({
if (props.length) { if (props.length) {
if (!this.$input) { if (!this.$input) {
this.$input = $('<input>', {value: 0, type: 'hidden' }); this.$input = $('<input type="hidden" value="0">');
this.input = this.$input.get(0); this.input = this.$input.get(0);
} }

3
src/style_manager/view/PropertyFileView.js

@ -36,7 +36,8 @@ module.exports = PropertyView.extend({
onRender() { onRender() {
if (!this.$input) { if (!this.$input) {
this.$input = $('<input>', {placeholder: this.model.getDefaultValue(), type: 'text' }); const plh = this.model.getDefaultValue();
this.$input = $(`<input placeholder="${plh}">`);
} }
if (!this.$preview) { if (!this.$preview) {

31
src/trait_manager/view/TraitView.js

@ -81,21 +81,24 @@ module.exports = Backbone.View.extend({
var md = this.model; var md = this.model;
var trg = this.target; var trg = this.target;
var name = md.get('name'); var name = md.get('name');
var opts = { const plh = md.get('placeholder') || md.get('default');
placeholder: md.get('placeholder') || md.get('default'), const type = md.get('type') || 'text';
type: md.get('type') || 'text' const attrs = trg.get('attributes');
}; const min = md.get('min');
if(md.get('changeProp')){ const max = md.get('max');
opts.value = trg.get(name); const value = md.get('changeProp') ?
}else{ trg.get(name) : md.get('value') || attrs[name];
var attrs = trg.get('attributes'); const input = $(`<input type="${type} placeholder="${plh}" value="${value}">`);
opts.value = md.get('value') || attrs[name];
if (min) {
input.prop('min', min);
}
if (max) {
input.prop('max', max);
} }
if(md.get('min'))
opts.min = md.get('min'); this.$input = input;
if(md.get('max'))
opts.max = md.get('max');
this.$input = $('<input>', opts);
} }
return this.$input.get(0); return this.$input.get(0);
}, },

3
src/utils/Sorter.js

@ -1,4 +1,5 @@
var Backbone = require('backbone'); const Backbone = require('backbone');
const $ = Backbone.$;
module.exports = Backbone.View.extend({ module.exports = Backbone.View.extend({

Loading…
Cancel
Save