Browse Source

Merge branch 'dev' into i18n

pull/2385/head
Artur Arseniev 7 years ago
parent
commit
18e5618ab1
  1. 2
      src/canvas/view/CanvasView.js
  2. 4
      src/dom_components/model/ComponentVideo.js
  3. 4
      src/style_manager/model/PropertyInteger.js

2
src/canvas/view/CanvasView.js

@ -440,7 +440,7 @@ export default Backbone.View.extend({
const id = model.getId();
if (!view.scriptContainer) {
view.scriptContainer = $(`<div id="${id}">`);
view.scriptContainer = $(`<div data-id="${id}">`);
this.getJsContainer().appendChild(view.scriptContainer.get(0));
}

4
src/dom_components/model/ComponentVideo.js

@ -182,8 +182,8 @@ export default Component.extend(
{
label: 'Poster',
name: 'poster',
placeholder: 'eg. ./media/image.jpg',
changeProp: 1
placeholder: 'eg. ./media/image.jpg'
// changeProp: 1
},
this.getAutoplayTrait(),
this.getLoopTrait(),

4
src/style_manager/model/PropertyInteger.js

@ -21,7 +21,8 @@ export default Property.extend({
max: ''
},
init() {
initialize(props = {}, opts = {}) {
Property.callParentInit(Property, this, props, opts);
const unit = this.get('unit');
const units = this.get('units');
this.input = new InputNumber({ model: this });
@ -29,6 +30,7 @@ export default Property.extend({
if (units.length && !unit) {
this.set('unit', units[0]);
}
Property.callInit(this, props, opts);
},
clearValue(opts = {}) {

Loading…
Cancel
Save