Browse Source

Prevent setting status in case the model is not found

pull/187/head
Artur Arseniev 9 years ago
parent
commit
23e96cd006
  1. 5
      index.html
  2. 3
      src/dom_components/index.js
  3. 6
      src/utils/Sorter.js

5
index.html

@ -858,9 +858,9 @@
} }
},{ },{
id: 'clean-all', id: 'clean-all',
run: function(editor, sender){ run: function(editor, sender) {
sender.set('active',false); sender.set('active',false);
if(confirm('Are you sure to clean the canvas?')){ if(confirm('Are you sure to clean the canvas?')) {
var comps = editor.DomComponents.clear(); var comps = editor.DomComponents.clear();
} }
} }
@ -1299,7 +1299,6 @@
editor.on('storage:store', function(e) { editor.on('storage:store', function(e) {
console.log('STORE ', e); console.log('STORE ', e);
}) })
editor.render(); editor.render();
</script> </script>
</body> </body>

3
src/dom_components/index.js

@ -216,7 +216,8 @@ module.exports = () => {
}catch(err){} }catch(err){}
}else if(d.html) }else if(d.html)
obj = d.html; obj = d.html;
if (obj) {
if (obj && obj.length) {
this.clear(); this.clear();
this.getComponents().reset(); this.getComponents().reset();
this.getComponents().add(obj); this.getComponents().add(obj);

6
src/utils/Sorter.js

@ -242,7 +242,7 @@ module.exports = Backbone.View.extend({
if (src) { if (src) {
var srcModel = this.getSourceModel(); var srcModel = this.getSourceModel();
srcModel && srcModel.set('status', 'freezed'); srcModel && srcModel.set && srcModel.set('status', 'freezed');
this.$document.on('mouseup', this.endMove); this.$document.on('mouseup', this.endMove);
} }
@ -285,7 +285,7 @@ module.exports = Backbone.View.extend({
let comps = em.get('DomComponents').getComponents(); let comps = em.get('DomComponents').getComponents();
let tempModel = comps.add(dropContent); let tempModel = comps.add(dropContent);
dropModel = comps.remove(tempModel); dropModel = comps.remove(tempModel);
this.dropModel = dropModel; this.dropModel = dropModel instanceof Array ? dropModel[0] : dropModel;
} }
return dropModel; return dropModel;
} }
@ -759,7 +759,7 @@ module.exports = Backbone.View.extend({
if (src) { if (src) {
var srcModel = this.getSourceModel(); var srcModel = this.getSourceModel();
if (srcModel) { if (srcModel && srcModel.set) {
srcModel.set('status', ''); srcModel.set('status', '');
srcModel.set('status', 'selected'); srcModel.set('status', 'selected');
} }

Loading…
Cancel
Save