Skip to content

Commit 58da6b1

Browse files
committed
Fix getModelToStyle in StyleManager
1 parent 76019a4 commit 58da6b1

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "grapesjs",
33
"description": "Free and Open Source Web Builder Framework",
4-
"version": "0.12.53",
4+
"version": "0.12.54",
55
"author": "Artur Arseniev",
66
"license": "BSD-3-Clause",
77
"homepage": "http://grapesjs.com",

src/style_manager/index.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -268,22 +268,18 @@ module.exports = () => {
268268
if (em) {
269269
const config = em.getConfig();
270270
const cssC = em.get('CssComposer');
271-
const avoidInline = config.avoidInlineStyle;
272271
const state = !config.devicePreviewMode ? model.get('state') : '';
272+
const valid = classes.getStyleable();
273+
const hasClasses = valid.length;
273274
const opts = { state };
274275

275-
// If true the model will be always a rule
276-
if (avoidInline) {
277-
const rule = cssC.getIdRule(id, opts);
278-
return rule ? rule : cssC.setIdRule(id, {}, opts);
279-
} else if (classes && classes.length) {
276+
if (hasClasses) {
280277
const deviceW = em.getCurrentMedia();
281-
const valid = classes.getStyleable();
282278
const CssRule = cssC.get(valid, state, deviceW);
283-
284-
if (CssRule && valid.length) {
285-
return CssRule;
286-
}
279+
if (CssRule) return CssRule;
280+
} else if (config.avoidInlineStyle) {
281+
const rule = cssC.getIdRule(id, opts);
282+
return rule ? rule : cssC.setIdRule(id, {}, opts);
287283
}
288284
}
289285

0 commit comments

Comments
 (0)