Browse Source

Get mediaCondition from Editor model config. Fixed tests - add storable to Editor model, proper CssComposer init

pull/988/head
Val Rudi 8 years ago
parent
commit
bb952eaace
  1. 4
      src/css_composer/view/CssRulesView.js
  2. 1
      src/editor/model/Editor.js
  3. 5
      test/specs/code_manager/model/CodeModels.js

4
src/css_composer/view/CssRulesView.js

@ -80,7 +80,9 @@ module.exports = require('backbone').View.extend({
getMediaWidth(mediaText) {
return (
mediaText &&
mediaText.replace(`(${this.config.mediaCondition}: `, '').replace(')', '')
mediaText
.replace(`(${this.em.getConfig('mediaCondition')}: `, '')
.replace(')', '')
);
},

1
src/editor/model/Editor.js

@ -52,6 +52,7 @@ module.exports = Backbone.Model.extend({
this.set('Config', c);
this.set('modules', []);
this.set('toLoad', []);
this.set('storables', []);
if (c.el && c.fromElement) this.config.components = c.el.innerHTML;

5
test/specs/code_manager/model/CodeModels.js

@ -71,9 +71,12 @@ module.exports = {
});
describe('CssGenerator', () => {
var newCssComp = () => new CssComposer().init();
let newCssComp;
beforeEach(() => {
em = new Editor({});
newCssComp = () => new CssComposer().init({ em });
cc = em.get('CssComposer');
obj = new CssGenerator();
dcomp = new DomComponents();

Loading…
Cancel
Save