From 50b6d45073eb4d49cbae2f1fc4bda981ec884c33 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Wed, 9 Feb 2022 18:01:28 +0100 Subject: [PATCH] Remove _innertext --- src/dom_components/model/ComponentText.js | 9 --------- src/dom_components/view/ComponentView.js | 6 +++--- src/rich_text_editor/model/RichTextEditor.js | 1 - 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/dom_components/model/ComponentText.js b/src/dom_components/model/ComponentText.js index b791d84d1..6171e958e 100644 --- a/src/dom_components/model/ComponentText.js +++ b/src/dom_components/model/ComponentText.js @@ -9,17 +9,8 @@ export default class ComponentText extends Component { cmps.forEach(model => { const textable = !!model.get('textable'); - const isBaseType = ['text', 'default', ''].some(type => model.is(type)); - const selectable = !isBaseType || textable; model.set( { - _innertext: model.get('_innertext') ? true : !selectable, - // editable: selectable && model.get('editable'), - // selectable: selectable, - // hoverable: selectable, - // draggable: textable, - // highlightable: 0, - // copyable: textable, ...(!textable && { toolbar: '' }), }, opts diff --git a/src/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js index 0fdb92613..26e708c57 100644 --- a/src/dom_components/view/ComponentView.js +++ b/src/dom_components/view/ComponentView.js @@ -30,7 +30,7 @@ export default Backbone.View.extend({ this.attr = model.get('attributes'); this.classe = this.attr.class || []; this.listenTo(model, 'change:style', this.updateStyle); - this.listenTo(model, 'change:attributes change:_innertext', this.renderAttributes); + this.listenTo(model, 'change:attributes', this.renderAttributes); this.listenTo(model, 'change:highlightable', this.updateHighlight); this.listenTo(model, 'change:status', this.updateStatus); this.listenTo(model, 'change:script rerender', this.reset); @@ -54,8 +54,8 @@ export default Backbone.View.extend({ __isDraggable() { const { model, config } = this; - const { _innertext, draggable } = model.attributes; - return config.draggableComponents && draggable && !_innertext; + const { draggable } = model.attributes; + return config.draggableComponents && draggable; }, _clbObj() { diff --git a/src/rich_text_editor/model/RichTextEditor.js b/src/rich_text_editor/model/RichTextEditor.js index 2fa16a996..bf4c837fc 100644 --- a/src/rich_text_editor/model/RichTextEditor.js +++ b/src/rich_text_editor/model/RichTextEditor.js @@ -333,7 +333,6 @@ export default class RichTextEditor { const toSel = cmp.find(`[${customElAttr}]`)[0]; if (!toSel) return; toSel.removeAttributes(customElAttr); - toSel.set({ _innertext: true }); editor.select(toSel); }); cmp.trigger('disable');