Browse Source

Fix getModelToStyle in StyleManager

Media text part was made incorrectly
pull/506/merge
Artur Arseniev 8 years ago
parent
commit
0900b0cfe2
  1. 24
      src/style_manager/index.js
  2. 1
      src/style_manager/view/SectorsView.js

24
src/style_manager/index.js

@ -249,16 +249,20 @@ module.exports = () => {
* @return {Model}
*/
getModelToStyle(model) {
var classes = model.get('classes');
if(c.em && classes && classes.length) {
var previewMode = c.em.get('Config').devicePreviewMode;
var device = c.em.getDeviceModel();
var state = !previewMode ? model.get('state') : '';
var deviceW = device && !previewMode ? device.get('width') : '';
var cssC = c.em.get('CssComposer');
var valid = classes.getStyleable();
var CssRule = cssC.get(valid, state, deviceW);
const classes = model.get('classes');
const em = c.em;
if (em && classes && classes.length) {
const emConfig = em.get('Config');
const previewMode = emConfig.devicePreviewMode;
const device = em.getDeviceModel();
const state = !previewMode ? model.get('state') : '';
const widthMedia = device && device.get('widthMedia');
const deviceW = device && !previewMode && widthMedia ?
`(${emConfig.mediaCondition}: ${widthMedia})` : '';
const cssC = em.get('CssComposer');
const valid = classes.getStyleable();
const CssRule = cssC.get(valid, state, deviceW);
if(CssRule && valid.length) {
return CssRule;

1
src/style_manager/view/SectorsView.js

@ -48,6 +48,7 @@ module.exports = Backbone.View.extend({
if(!el)
return;
// TODO make use of getModelToStyle here
const config = em.get('Config');
var previewMode = config.devicePreviewMode;
var classes = el.get('classes');

Loading…
Cancel
Save