Browse Source

Pass options in setIdStyle

pull/540/head
Artur Arseniev 8 years ago
parent
commit
717fa234bd
  1. 2
      src/css_composer/index.js
  2. 5
      src/dom_components/view/ComponentView.js
  3. 6
      src/domain_abstract/model/Styleable.js

2
src/css_composer/index.js

@ -286,7 +286,7 @@ module.exports = () => {
const sm = em.get('SelectorManager');
const selector = sm.add({ name, type: Selector.TYPE_ID });
const rule = this.add(selector, state, media);
rule.setStyle(style);
rule.setStyle(style, opts);
return rule;
},

5
src/dom_components/view/ComponentView.js

@ -144,12 +144,13 @@ module.exports = Backbone.View.extend({
* Update style attribute
* @private
* */
updateStyle() {
updateStyle(mod, val, opts = {}) {
const em = this.em;
const model = this.model;
const style = model.getStyle();
const state = model.get('state');
em.get('CssComposer').setIdStyle(model.getId(), style, { state });
const cc = em.get('CssComposer');
cc.setIdStyle(model.getId(), style, { ...opts, state });
},

6
src/domain_abstract/model/Styleable.js

@ -11,7 +11,7 @@ export default {
* @return {Object}
*/
extendStyle(prop) {
return Object.assign({}, this.getStyle(), prop);
return { ...this.getStyle(), ...prop};
},
/**
@ -19,7 +19,7 @@ export default {
* @return {Object}
*/
getStyle() {
return Object.assign({}, this.get('style'));
return { ...this.get('style') };
},
/**
@ -32,7 +32,7 @@ export default {
prop = parseStyle(prop);
}
this.set('style', Object.assign({}, prop), opts);
this.set('style', { ...prop }, opts);
for (let pr in prop) {
this.trigger(`change:style:${pr}`);

Loading…
Cancel
Save