From 3021fe140f15346f6d485d406f88777f107510b1 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Sat, 14 Sep 2019 19:02:35 +0200 Subject: [PATCH] Load style in new Frames --- src/canvas/model/Frame.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/canvas/model/Frame.js b/src/canvas/model/Frame.js index 3f8115deb..73cd5fabf 100644 --- a/src/canvas/model/Frame.js +++ b/src/canvas/model/Frame.js @@ -1,6 +1,7 @@ import Backbone from 'backbone'; import Component from 'dom_components/model/Component'; import CssRules from 'css_composer/model/CssRules'; +import { isString } from 'underscore'; export default Backbone.Model.extend({ defaults: { @@ -17,9 +18,13 @@ export default Backbone.Model.extend({ }, initialize(props, opts = {}) { - console.log(props, opts); const { root, styles, components } = this.attributes; this.set('head', []); + const modOpts = { + em: opts.em, + frame: this + }; + !root && this.set( 'root', @@ -28,13 +33,12 @@ export default Backbone.Model.extend({ type: 'wrapper', components: components || [] }, - { - em: opts.em, - frame: this - } + modOpts ) ); - !styles && this.set('styles', new CssRules()); + + (!styles || isString(styles)) && + this.set('styles', new CssRules(styles, modOpts)); }, getHead() {