Browse Source

Update setTarget in StyleManager

pull/1518/head
Artur Arseniev 7 years ago
parent
commit
3a347c09cb
  1. 2
      src/selector_manager/view/ClassTagsView.js
  2. 6
      src/style_manager/view/PropertyView.js
  3. 8
      src/style_manager/view/SectorsView.js

2
src/selector_manager/view/ClassTagsView.js

@ -191,7 +191,7 @@ module.exports = Backbone.View.extend({
const state = selected.get('state'); const state = selected.get('state');
const coll = collection; const coll = collection;
let result = coll.getFullString(coll.getStyleable()); let result = coll.getFullString(selected.getSelectors().getStyleable());
result = result =
result || result ||
selected.get('selectorsAdd') || selected.get('selectorsAdd') ||

6
src/style_manager/view/PropertyView.js

@ -68,7 +68,11 @@ module.exports = Backbone.View.extend({
em && em.on(`update:component:style:${this.property}`, this.targetUpdated); em && em.on(`update:component:style:${this.property}`, this.targetUpdated);
//em && em.on(`styleable:change:${this.property}`, this.targetUpdated); //em && em.on(`styleable:change:${this.property}`, this.targetUpdated);
this.listenTo(this.propTarget, 'update', this.targetUpdated); this.listenTo(
this.propTarget,
'update styleManager:update',
this.targetUpdated
);
this.listenTo(model, 'destroy remove', this.remove); this.listenTo(model, 'destroy remove', this.remove);
this.listenTo(model, 'change:value', this.modelValueChanged); this.listenTo(model, 'change:value', this.modelValueChanged);
this.listenTo(model, 'targetUpdated', this.targetUpdated); this.listenTo(model, 'targetUpdated', this.targetUpdated);

8
src/style_manager/view/SectorsView.js

@ -94,17 +94,20 @@ module.exports = Backbone.View.extend({
setTarget(target, opts = {}) { setTarget(target, opts = {}) {
const em = this.target; const em = this.target;
const config = em.get('Config'); const config = em.get('Config');
const { targetIsClass, stylable } = opts;
let model = target; let model = target;
if (isString(target)) { if (isString(target)) {
let rule; let rule;
const rules = em.get('CssComposer').getAll(); const rules = em.get('CssComposer').getAll();
if (opts.targetIsClass) { if (targetIsClass) {
rule = rules.filter( rule = rules.filter(
rule => rule.get('selectors').getFullString() === target rule => rule.get('selectors').getFullString() === target
)[0]; )[0];
} else { }
if (!rule) {
rule = rules.filter(rule => rule.get('selectorsAdd') === target)[0]; rule = rules.filter(rule => rule.get('selectorsAdd') === target)[0];
} }
@ -112,6 +115,7 @@ module.exports = Backbone.View.extend({
rule = rules.add({ selectors: [], selectorsAdd: target }); rule = rules.add({ selectors: [], selectorsAdd: target });
} }
stylable && rule.set({ stylable });
model = rule; model = rule;
} }

Loading…
Cancel
Save