Browse Source

Fix errors in IE11. Closes #2247

pull/2295/head
Artur Arseniev 6 years ago
parent
commit
8dee8fd3c8
  1. 3
      src/dom_components/model/Component.js
  2. 14
      src/dom_components/view/ComponentView.js
  3. 3
      src/domain_abstract/model/Styleable.js

3
src/dom_components/model/Component.js

@ -406,8 +406,9 @@ const Component = Backbone.Model.extend(Styleable).extend(
const { opt } = this; const { opt } = this;
if (em && em.getConfig('avoidInlineStyle') && !opt.temporary) { if (em && em.getConfig('avoidInlineStyle') && !opt.temporary) {
const style = this.get('style') || {};
prop = isString(prop) ? this.parseStyle(prop) : prop; prop = isString(prop) ? this.parseStyle(prop) : prop;
prop = { ...prop, ...this.get('style') }; prop = { ...prop, ...style };
const state = this.get('state'); const state = this.get('state');
const cc = em.get('CssComposer'); const cc = em.get('CssComposer');
const propOrig = this.getStyle(); const propOrig = this.getStyle();

14
src/dom_components/view/ComponentView.js

@ -276,12 +276,14 @@ export default Backbone.View.extend({
const defaultAttr = { const defaultAttr = {
'data-gjs-type': type || 'default', 'data-gjs-type': type || 'default',
...(draggableComponents && { draggable: true }), ...(draggableComponents ? { draggable: true } : {}),
...(highlightable && { 'data-highlightable': 1 }), ...(highlightable ? { 'data-highlightable': 1 } : {}),
...(textable && { ...(textable
contenteditable: 'false', ? {
'data-gjs-textable': 'true' contenteditable: 'false',
}) 'data-gjs-textable': 'true'
}
: {})
}; };
// Remove all current attributes // Remove all current attributes

3
src/domain_abstract/model/Styleable.js

@ -22,7 +22,8 @@ export default {
* @return {Object} * @return {Object}
*/ */
getStyle() { getStyle() {
return { ...this.get('style') }; const style = this.get('style') || {};
return { ...style };
}, },
/** /**

Loading…
Cancel
Save