Browse Source

Remove selectedComponent references

multiple-select
Artur Arseniev 8 years ago
parent
commit
856dabbedf
  1. 3
      src/editor/model/Editor.js
  2. 2
      src/selector_manager/view/ClassTagView.js
  3. 2
      src/style_manager/view/PropertyView.js
  4. 6
      test/specs/selector_manager/e2e/ClassManager.js

3
src/editor/model/Editor.js

@ -41,7 +41,6 @@ module.exports = Backbone.Model.extend({
selected: new Collection(),
clipboard: null,
designerMode: false,
selectedComponent: null,
componentHovered: null,
previousModel: null,
changesCount: 0,
@ -227,10 +226,8 @@ module.exports = Backbone.Model.extend({
setSelected(el, opts = {}) {
const model = getModel(el, $);
if (model && !model.get('selectable')) return;
opts.forceChange && this.set('selectedComponent', '');
const selected = this.get('selected');
selected.remove(selected.filter(sel => sel !== model));
// this.set('selectedComponent', model, opts);
this.addSelected(model, opts);
},

2
src/selector_manager/view/ClassTagView.js

@ -94,7 +94,7 @@ module.exports = require('backbone').View.extend({
const model = this.model;
const coll = this.coll;
const el = this.el;
const sel = em && em.get('selectedComponent');
const sel = em && em.getSelected();
sel && sel.get & sel.get('classes').remove(model);
coll && coll.remove(model);
setTimeout(() => this.remove(), 0);

2
src/style_manager/view/PropertyView.js

@ -413,7 +413,7 @@ module.exports = Backbone.View.extend({
*/
isComponentStylable() {
const em = this.em;
const component = em && em.get('selectedComponent');
const component = em && em.getSelected();
if (!component) {
return true;

6
test/specs/selector_manager/e2e/ClassManager.js

@ -83,7 +83,7 @@ module.exports = {
test('Can assign only one time the same class on selected component and the class viewer', () => {
var model = components.add({});
gjs.editor.set('selectedComponent', model);
gjs.editor.setSelected(model);
tagEl.addNewTag('test');
tagEl.addNewTag('test');
expect(model.get('classes').length).toEqual(1);
@ -99,7 +99,7 @@ module.exports = {
test('Removing from container removes also from selected component', () => {
var model = components.add({});
gjs.editor.set('selectedComponent', model);
gjs.editor.setSelected(model);
tagEl.addNewTag('test');
tagEl
.getClasses()
@ -111,7 +111,7 @@ module.exports = {
test('Trigger correctly event on target with new class add', () => {
var spy = sinon.spy();
var model = components.add({});
gjs.editor.set('selectedComponent', model);
gjs.editor.setSelected(model);
tagEl.addNewTag('test');
gjs.editor.on('component:update:classes', spy);
tagEl.addNewTag('test');

Loading…
Cancel
Save