Browse Source

Update getModelToStyle with getStyleable method

pull/261/head
Artur Arseniev 9 years ago
parent
commit
7f4238e6cb
  1. 3
      src/selector_manager/view/ClassTagView.js
  2. 6
      src/style_manager/index.js
  3. 4
      src/style_manager/view/SectorsView.js

3
src/selector_manager/view/ClassTagView.js

@ -1,4 +1,5 @@
var Backbone = require('backbone'); var Backbone = require('backbone');
const Selector = require('./../model/Selector');
module.exports = Backbone.View.extend({ module.exports = Backbone.View.extend({
template: _.template(` template: _.template(`
@ -46,7 +47,7 @@ module.exports = Backbone.View.extend({
*/ */
endEditTag() { endEditTag() {
var value = this.$labelInput.val(); var value = this.$labelInput.val();
var next = this.model.escapeName(value); var next = Selector.escapeName(value);
if(this.target){ if(this.target){
var clsm = this.target.get('SelectorManager'); var clsm = this.target.get('SelectorManager');

6
src/style_manager/index.js

@ -240,12 +240,10 @@ module.exports = () => {
var state = !previewMode ? model.get('state') : ''; var state = !previewMode ? model.get('state') : '';
var deviceW = device && !previewMode ? device.get('width') : ''; var deviceW = device && !previewMode ? device.get('width') : '';
var cssC = c.em.get('CssComposer'); var cssC = c.em.get('CssComposer');
var valid = classes.getStyleable();
var valid = _.filter(classes.models, item => item.get('active'));
var CssRule = cssC.get(valid, state, deviceW); var CssRule = cssC.get(valid, state, deviceW);
if(CssRule) { if(CssRule && valid.length) {
return CssRule; return CssRule;
} }
} }

4
src/style_manager/view/SectorsView.js

@ -46,10 +46,10 @@ module.exports = Backbone.View.extend({
var device = em.getDeviceModel(); var device = em.getDeviceModel();
var state = !previewMode ? el.get('state') : ''; var state = !previewMode ? el.get('state') : '';
var widthMedia = device && device.get('widthMedia'); var widthMedia = device && device.get('widthMedia');
var mediaText = device && !previewMode && widthMedia ?
`(${config.mediaCondition}: ${widthMedia})` : '';
var stateStr = state ? `:${state}` : null; var stateStr = state ? `:${state}` : null;
var view = el.view; var view = el.view;
var mediaText = device && !previewMode && widthMedia ?
`(${config.mediaCondition}: ${widthMedia})` : '';
pt.helper = null; pt.helper = null;
if (view) { if (view) {

Loading…
Cancel
Save