Browse Source

Update componenet selection on page change

pull/3411/head
Artur Arseniev 5 years ago
parent
commit
b50af461dc
  1. 3
      src/canvas/model/Canvas.js
  2. 16
      src/canvas/view/CanvasView.js
  3. 1
      src/dom_components/view/ComponentView.js
  4. 1
      src/editor/view/EditorView.js

3
src/canvas/model/Canvas.js

@ -33,6 +33,9 @@ export default Backbone.Model.extend({
},
_pageUpdated(page, prev) {
const { em } = this;
em.setSelected();
em.stopDefault(); // We have to stop before changing current frames
prev && prev.getFrames().map(frame => frame.disable());
this.set('frames', page.getFrames());
},

16
src/canvas/view/CanvasView.js

@ -42,10 +42,19 @@ export default Backbone.View.extend({
this.listenTo(em, 'component:selected', this.checkSelected);
this.listenTo(model, 'change:zoom change:x change:y', this.updateFrames);
this.listenTo(model, 'change:frames', this._onFramesUpdate);
this.listenTo(frames, 'loaded:all', () => em.trigger('loaded'));
this.listenTo(frames, 'loaded:all', this._framesLoaded);
this.toggleListeners(1);
},
_framesLoaded() {
this.em.trigger('loaded');
},
_onFramesUpdate() {
this._initFrames();
this._renderFrames();
},
_initFrames() {
const { frames, model, config } = this;
frames && frames.remove();
@ -335,11 +344,6 @@ export default Backbone.View.extend({
return (view && view._getFrame()) || this.em.get('currentFrame');
},
_onFramesUpdate() {
this._initFrames();
this._renderFrames();
},
_renderFrames() {
const { model, frames, em, framesArea } = this;
const frms = model.get('frames');

1
src/dom_components/view/ComponentView.js

@ -112,6 +112,7 @@ export default Backbone.View.extend({
delete view.childrenView;
delete view.scriptContainer;
delete view.opts;
delete model.view;
// delete view.el;
return view;
},

1
src/editor/view/EditorView.js

@ -14,7 +14,6 @@ export default Backbone.View.extend({
this.pn.active();
this.pn.disableButtons();
setTimeout(() => {
model.runDefault();
model.trigger('load', model.get('Editor'));
});
});

Loading…
Cancel
Save