Browse Source

Merge pull request #202 from thecodefish/dev

Temporarily adding components via the Sorter suppresses the change event and includes a flag that can be checked in other event handlers
pull/222/head
Artur Arseniev 9 years ago
committed by GitHub
parent
commit
d9547c6ec4
  1. 10
      src/editor/model/Editor.js
  2. 4
      src/utils/Sorter.js

10
src/editor/model/Editor.js

@ -161,6 +161,12 @@ module.exports = Backbone.Model.extend({
* @private
* */
componentsUpdated(model, val, opt) {
var temp = opt ? opt.temporary : 0;
if (temp) {
//component has been added temporarily - do not update storage or record changes
return;
}
timedInterval && clearInterval(timedInterval);
timedInterval = setTimeout(() => {
var count = this.get('changesCount') + 1;
@ -281,7 +287,7 @@ module.exports = Backbone.Model.extend({
this.listenTo(model, evn, this.componentsUpdated);
if(!avSt)
this.componentsUpdated();
this.componentsUpdated(model, val, opt);
},
/**
@ -310,7 +316,7 @@ module.exports = Backbone.Model.extend({
var avSt = opt ? opt.avoidStore : 0;
if(!avSt)
this.componentsUpdated();
this.componentsUpdated(model, val, opt);
},
/**

4
src/utils/Sorter.js

@ -283,8 +283,8 @@ module.exports = Backbone.View.extend({
if (dropContent && em) {
if (!dropModel) {
let comps = em.get('DomComponents').getComponents();
let tempModel = comps.add(dropContent, {avoidUpdateStyle: 1});
dropModel = comps.remove(tempModel);
let tempModel = comps.add(dropContent, {avoidUpdateStyle: 1, temporary: 1});
dropModel = comps.remove(tempModel, {temporary: 1});
this.dropModel = dropModel instanceof Array ? dropModel[0] : dropModel;
}
return dropModel;

Loading…
Cancel
Save