Browse Source

Add protectedCss to getCss result

pull/72/head
Artur Arseniev 9 years ago
parent
commit
9582802596
  1. 2
      bower.json
  2. 4
      dist/css/grapes.min.css
  3. 2
      package.json
  4. 4
      src/editor/model/Editor.js
  5. 3
      styles/css/main.css
  6. 1
      styles/scss/main.scss
  7. 8
      test/specs/grapesjs/main.js

2
bower.json

@ -1,7 +1,7 @@
{
"name": "grapesjs",
"description": "Open source Web Template Editor",
"version": "0.3.55",
"version": "0.3.57",
"author": "Artur Arseniev",
"homepage": "http://grapesjs.com",
"main": [

4
dist/css/grapes.min.css

File diff suppressed because one or more lines are too long

2
package.json

@ -1,7 +1,7 @@
{
"name": "grapesjs",
"description": "Open source Web Template Editor",
"version": "0.3.55",
"version": "0.3.57",
"author": "Artur Arseniev",
"license": "BSD-3-Clause",
"homepage": "http://grapesjs.com",

4
src/editor/model/Editor.js

@ -369,7 +369,9 @@ define(['backbone', 'backboneUndo', 'keymaster', 'Utils', 'StorageManager', 'Dev
return;
var wrp = cmp.getComponent();
return cm.getCode(wrp, 'css', cssc);
var protCss = this.config.protectedCss;
return protCss + cm.getCode(wrp, 'css', cssc);
},
/**

3
styles/css/main.css

@ -3121,7 +3121,8 @@ ol.example li.placeholder:before {
visibility: visible; }
.gjs-nav-comp-name {
padding: 5px; }
padding: 5px;
box-sizing: content-box; }
/************* END Navigator *************/
/* pa-refresh pa-rocket pa-trash pa-columns pa-rotate-left/right */

1
styles/scss/main.scss

@ -683,6 +683,7 @@ ol.example li.placeholder:before {position: absolute;}
.#{$app-prefix}nav-comp-name {
padding: 5px;
box-sizing: content-box;
}
/************* END Navigator *************/

8
test/specs/grapesjs/main.js

@ -64,8 +64,9 @@ define(['GrapesJS', 'PluginManager', 'chai'],
var editor = obj.init(config);
var html = editor.getHtml();
var css = editor.getCss();
var protCss = editor.getConfig().protectedCss;
(html ? html : '').should.be.empty;
(css ? css : '').should.be.empty;
(css ? css : '').should.equal(protCss);
editor.getComponents().length.should.equal(0);
editor.getStyle().length.should.equal(0);
});
@ -92,8 +93,9 @@ define(['GrapesJS', 'PluginManager', 'chai'],
var editor = obj.init(config);
var html = editor.getHtml();
var css = editor.getCss();
var protCss = editor.getConfig().protectedCss;
(html ? html : '').should.equal(htmlString);
(css ? css : '').should.equal('.test2{color:red;}');// .test3 is discarded in css
(css ? css : '').should.equal(protCss + '.test2{color:red;}');// .test3 is discarded in css
editor.getComponents().length.should.equal(2);
editor.getStyle().length.should.equal(2);// .test3 is still here
});
@ -209,4 +211,4 @@ define(['GrapesJS', 'PluginManager', 'chai'],
});
});
});

Loading…
Cancel
Save