Browse Source

Update component style when componentFirst is active

pull/2474/head
Artur Arseniev 7 years ago
parent
commit
67aa670ab4
  1. 6
      src/selector_manager/view/ClassTagsView.js
  2. 4
      src/style_manager/index.js

6
src/selector_manager/view/ClassTagsView.js

@ -71,12 +71,6 @@ export default Backbone.View.extend({
return emitter || {}; return emitter || {};
}, },
// getSelectedModel() {
// const { em, config } = this;
// const sm = em && em.get('StyleManager');
// return sm && sm.getModelToStyle(em.getSelected());
// },
/** /**
* Triggered when a tag is removed from collection * Triggered when a tag is removed from collection
* @param {Object} model Removed model * @param {Object} model Removed model

4
src/style_manager/index.js

@ -265,6 +265,8 @@ export default () => {
const config = em.getConfig(); const config = em.getConfig();
const um = em.get('UndoManager'); const um = em.get('UndoManager');
const cssC = em.get('CssComposer'); const cssC = em.get('CssComposer');
const sm = em.get('SelectorManager');
const smConf = sm ? sm.getConfig() : {};
const state = !config.devicePreviewMode ? model.get('state') : ''; const state = !config.devicePreviewMode ? model.get('state') : '';
const valid = classes.getStyleable(); const valid = classes.getStyleable();
const hasClasses = valid.length; const hasClasses = valid.length;
@ -277,7 +279,7 @@ export default () => {
// #268 // #268
um.stop(); um.stop();
if (hasClasses) { if (hasClasses && !smConf.componentFirst) {
const deviceW = em.getCurrentMedia(); const deviceW = em.getCurrentMedia();
rule = cssC.get(valid, state, deviceW); rule = cssC.get(valid, state, deviceW);

Loading…
Cancel
Save