From bbe8bf2dacdb515985e3f3fea5dd167ac456205e Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Sun, 3 Jun 2018 00:53:44 +0200 Subject: [PATCH] Remove selectedComponent reference in ClassTagsView --- src/dom_components/index.js | 11 ----------- src/dom_components/model/ComponentVideo.js | 2 +- src/selector_manager/view/ClassTagsView.js | 8 ++------ 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/dom_components/index.js b/src/dom_components/index.js index b09d4b0e0..5bc9c9b3d 100644 --- a/src/dom_components/index.js +++ b/src/dom_components/index.js @@ -192,7 +192,6 @@ module.exports = () => { c.modal = em.get('Modal') || ''; c.am = em.get('AssetManager') || ''; em.get('Parser').compTypes = componentTypes; - em.on('change:selectedComponent', this.componentChanged, this); em.on('change:componentHovered', this.componentHovered, this); const selected = em.get('selected'); @@ -546,16 +545,6 @@ module.exports = () => { } }, - /** - * Triggered when the selected component is changed - * @private - */ - componentChanged() { - const em = c.em; - this.selectRemove(em.previous('selectedComponent')); - this.selectAdd(em.get('selectedComponent')); - }, - /** * Triggered when the component is hovered * @private diff --git a/src/dom_components/model/ComponentVideo.js b/src/dom_components/model/ComponentVideo.js index 6efb6dca8..f3a9e5feb 100644 --- a/src/dom_components/model/ComponentVideo.js +++ b/src/dom_components/model/ComponentVideo.js @@ -125,7 +125,7 @@ module.exports = Component.extend( this.set('tagName', 'video'); } this.loadTraits(traits); - this.em.trigger('change:selectedComponent'); + this.em.trigger('component:toggled'); }, // Listen provider change and switch traits, in TraitView listen traits change diff --git a/src/selector_manager/view/ClassTagsView.js b/src/selector_manager/view/ClassTagsView.js index ebe6efeca..0f014fcfd 100644 --- a/src/selector_manager/view/ClassTagsView.js +++ b/src/selector_manager/view/ClassTagsView.js @@ -52,11 +52,7 @@ module.exports = Backbone.View.extend({ this.target = this.config.em; this.em = this.target; - this.listenTo( - this.target, - 'change:selectedComponent', - this.componentChanged - ); + this.listenTo(this.target, 'component:toggled', this.componentChanged); this.listenTo(this.target, 'component:update:classes', this.updateSelector); this.listenTo(this.collection, 'add', this.addNew); @@ -138,7 +134,7 @@ module.exports = Backbone.View.extend({ * @private */ componentChanged(e) { - this.compTarget = this.target.get('selectedComponent'); + this.compTarget = this.target.getSelected(); const target = this.compTarget; let validSelectors = [];