Browse Source

Render the textable element

pull/2031/head
Artur Arseniev 8 years ago
parent
commit
fbf144131c
  1. 25
      src/utils/Sorter.js

25
src/utils/Sorter.js

@ -119,10 +119,6 @@ module.exports = Backbone.View.extend({
sel.addRange(range); sel.addRange(range);
}, },
disableEditingOn(model) {
model && model.getView().disableEditing();
},
setContentEditable(model, mode) { setContentEditable(model, mode) {
if (model) { if (model) {
const el = model.getEl(); const el = model.getEl();
@ -404,11 +400,10 @@ module.exports = Backbone.View.extend({
* */ * */
onMove(e) { onMove(e) {
const ev = e; const ev = e;
const { em, onMoveClb, activeTextModel } = this; const { em, onMoveClb, plh } = this;
this.moved = 1; this.moved = 1;
// Turn placeholder visibile // Turn placeholder visibile
var plh = this.plh;
var dsp = plh.style.display; var dsp = plh.style.display;
if (!dsp || dsp === 'none') plh.style.display = 'block'; if (!dsp || dsp === 'none') plh.style.display = 'block';
@ -489,7 +484,7 @@ module.exports = Backbone.View.extend({
disableTextable() { disableTextable() {
const { activeTextModel } = this; const { activeTextModel } = this;
activeTextModel && this.setContentEditable(activeTextModel, false); activeTextModel && activeTextModel.getView().disableEditing();
}, },
/** /**
@ -1074,15 +1069,19 @@ module.exports = Backbone.View.extend({
const viewActive = activeTextModel.getView(); const viewActive = activeTextModel.getView();
activeTextModel.trigger('active'); activeTextModel.trigger('active');
const { activeRte } = viewActive; const { activeRte } = viewActive;
const modelEl = model.getEl();
model.getView().render();
modelEl.setAttribute('data-gjs-textable', 'true');
const { outerHTML } = modelEl;
console.log( console.log(
'model.toHTML()', 'model.toHTML()',
model.toHTML(), model.toHTML(),
'el',
model.getEl().outerHTML,
'model', 'model',
model model,
'outerHTML',
outerHTML
); );
activeRte.insertHTML && activeRte.insertHTML(model.toHTML()); activeRte.insertHTML && activeRte.insertHTML(outerHTML);
} else { } else {
created = targetCollection.add(modelToDrop, opts); created = targetCollection.add(modelToDrop, opts);
} }
@ -1093,10 +1092,6 @@ module.exports = Backbone.View.extend({
this.dropContent = null; this.dropContent = null;
} }
if (isTextableActive) {
this.disableEditingOn(activeTextModel); // TODO disableEditingOn is used only here
}
// This will cause to recalculate children dimensions // This will cause to recalculate children dimensions
this.prevTarget = null; this.prevTarget = null;
} else { } else {

Loading…
Cancel
Save