Browse Source

Move protectedCss before other styles

pull/187/head
Artur Arseniev 9 years ago
parent
commit
b44a05fd79
  1. 4
      dist/grapes.min.js
  2. 2
      package.json
  3. 2
      src/canvas/view/CanvasView.js

4
dist/grapes.min.js

File diff suppressed because one or more lines are too long

2
package.json

@ -1,7 +1,7 @@
{
"name": "grapesjs",
"description": "Free and Open Source Web Builder Framework",
"version": "0.8.4",
"version": "0.8.5",
"author": "Artur Arseniev",
"license": "BSD-3-Clause",
"homepage": "http://grapesjs.com",

2
src/canvas/view/CanvasView.js

@ -67,7 +67,6 @@ module.exports = Backbone.View.extend({
var body = this.frame.$el.contents().find('body');
var cssc = em.get('CssComposer');
var conf = em.get('Config');
body.append(wrap.render()).append(cssc.render());
var protCss = conf.protectedCss;
// I need all this styles to make the editor work properly
@ -85,6 +84,7 @@ module.exports = Backbone.View.extend({
(conf.canvasCss || '');
frameCss += protCss || '';
body.append('<style>' + frameCss + '</style>');
body.append(wrap.render()).append(cssc.render());
body.append(this.getJsContainer());
em.trigger('loaded');
this.frame.el.contentWindow.onscroll = this.onFrameScroll;

Loading…
Cancel
Save