Browse Source

Update css rule rendering

pull/36/head
Artur Arseniev 10 years ago
parent
commit
09304a9b3b
  1. 8
      src/css_composer/view/CssRuleView.js
  2. 6
      src/style_manager/view/SectorsView.js

8
src/css_composer/view/CssRuleView.js

@ -51,17 +51,21 @@ define(['backbone'],
render : function(){ render : function(){
var block = '', var block = '',
selStr = ''; selStr = '';
o = ''; o = '';
if(!this.selStr) if(!this.selStr)
this.selStr = this.renderSelectors(); this.selStr = this.renderSelectors();
var prpStr = this.renderProperties(); var prpStr = this.renderProperties();
var stateStr = this.model.get('state'); var stateStr = this.model.get('state');
var width = this.model.get('maxWidth');
if(this.selStr){ if(this.selStr){
stateStr = stateStr ? ':' + stateStr : ''; stateStr = stateStr ? ':' + stateStr : '';
block = prpStr !== '' ? '{' + prpStr + '}' : ''; block = prpStr !== '' ? '{' + prpStr + '}' : '';
} }
o = this.selStr && block ? this.selStr + stateStr + block : ''; o = this.selStr && block ? this.selStr + stateStr + block : '';
if(width && o){
o = '@media (max-width: ' + width + '){' + o + '}';
}
this.$el.html(o); this.$el.html(o);
return this; return this;
}, },

6
src/style_manager/view/SectorsView.js

@ -41,6 +41,8 @@ define(['backbone', './SectorView'],
var classes = el.get('classes'); var classes = el.get('classes');
var state = el.get('state'); var state = el.get('state');
var pt = this.propTarget; var pt = this.propTarget;
var device = this.target.getDeviceModel();
var deviceW = device ? device.get('width') : '';
pt.helper = null; pt.helper = null;
if(classes.length){ if(classes.length){
@ -48,10 +50,10 @@ define(['backbone', './SectorView'],
var valid = _.filter(classes.models, function(item){ var valid = _.filter(classes.models, function(item){
return item.get('active'); return item.get('active');
}); });
var iContainer = cssC.getRule(valid, state, ''); var iContainer = cssC.getRule(valid, state, deviceW);
if(!iContainer){ if(!iContainer){
iContainer = cssC.newRule(valid, state, ''); iContainer = cssC.newRule(valid, state, deviceW);
// Hydrate styles from component element // Hydrate styles from component element
iContainer.set('style', el.get('style')); iContainer.set('style', el.get('style'));
cssC.addRule(iContainer); cssC.addRule(iContainer);

Loading…
Cancel
Save