Browse Source

Fix CssComposer importer with maxWidth value

pull/36/head
Artur Arseniev 10 years ago
parent
commit
2b8df68d7e
  1. 2
      bower.json
  2. 4
      dist/grapes.min.js
  3. 2
      package.json
  4. 2
      src/css_composer/main.js
  5. 2
      src/dom_components/model/Components.js
  6. 2
      src/parser/model/ParserCss.js
  7. 7
      test/specs/css_composer/e2e/CssComposer.js

2
bower.json

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

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": "Open source Web Template Editor",
"version": "0.3.20",
"version": "0.3.21",
"author": "Artur Arseniev",
"license": "BSD-3-Clause",
"homepage": "http://grapesjs.com",

2
src/css_composer/main.js

@ -236,7 +236,7 @@ define(function(require) {
var selec = sm.add(sels[j]);
newSels.push(selec);
}
var model = this.add(newSels, rule.state, rule.width);
var model = this.add(newSels, rule.state, rule.maxWidth);
model.set('style', rule.style || {});
result.push(model);
}

2
src/dom_components/model/Components.js

@ -29,7 +29,7 @@ define([ 'backbone', 'require'],
this.mComponentText = require("./ComponentText");
model = new this.mComponentText(attrs, options);
break;
case 'link':
if(!this.mComponentLink)
this.mComponentLink = require("./ComponentLink");

2
src/parser/model/ParserCss.js

@ -119,4 +119,4 @@ define(function(require) {
};
});
});

7
test/specs/css_composer/e2e/CssComposer.js

@ -39,7 +39,7 @@ define(['GrapesJS'],function(GrapesJS) {
rulesSet2 = [
{ selectors: [{name: 'test1'}, {name: 'test2'}], state:':active' },
{ selectors: [{name: 'test2'}, {name: 'test3'}] },
{ selectors: [{name: 'test3'}], width:'900px' }
{ selectors: [{name: 'test3'}], maxWidth:'900px' }
];
});
@ -109,6 +109,11 @@ define(['GrapesJS'],function(GrapesJS) {
coll1.should.deep.equal(coll2);
});
it('Add raw rule objects with width via addCollection', function() {
var coll1 = cssc.addCollection(rulesSet2);
coll1[2].get('maxWidth').should.equal(rulesSet2[2].maxWidth);
});
});
}
};

Loading…
Cancel
Save