Browse Source

Fix regressions

pull/487/head
Artur Arseniev 8 years ago
parent
commit
faae205c80
  1. 6
      dist/grapes.min.js
  2. 2
      package.json
  3. 4
      test/specs/style_manager/model/Models.js
  4. 11
      test/specs/style_manager/view/PropertyIntegerView.js
  5. 7
      test/specs/style_manager/view/PropertyView.js

6
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.12.20",
"version": "0.12.21",
"author": "Artur Arseniev",
"license": "BSD-3-Clause",
"homepage": "http://grapesjs.com",

4
test/specs/style_manager/model/Models.js

@ -462,24 +462,28 @@ module.exports = {
type : 'integer',
units : ['px','%'],
defaults : 0,
min: 0,
},{
property : 'padding-right',
fixedValues: ['initial', 'inherit', 'auto'],
type : 'integer',
units : ['px','%'],
defaults : 0,
min: 0,
},{
property : 'padding-bottom',
fixedValues: ['initial', 'inherit', 'auto'],
type : 'integer',
units : ['px','%'],
defaults : 0,
min: 0,
},{
property : 'padding-left',
fixedValues: ['initial', 'inherit', 'auto'],
type : 'integer',
units : ['px','%'],
defaults : 0,
min: 0,
},],
};
expect(obj.build('padding')).toEqual([res]);

11
test/specs/style_manager/view/PropertyIntegerView.js

@ -6,7 +6,7 @@ const Component = require('dom_components/model/Component');
module.exports = {
run() {
describe.only('PropertyIntegerView', () => {
describe('PropertyIntegerView', () => {
var component;
var fixtures;
@ -111,12 +111,9 @@ module.exports = {
});
it('Update target on value change', () => {
view.selectedComponent = component;
view.model.set('value', intValue);
var compStyle = view.selectedComponent.get('style');
var assertStyle = {};
assertStyle[propName] = intValue;
expect(compStyle).toEqual(assertStyle);
const val = `${intValue}%`;
view.model.setValue(val);
expect(view.getTargetValue()).toEqual(val);
});
describe('With target setted', () => {

7
test/specs/style_manager/view/PropertyView.js

@ -133,11 +133,10 @@ module.exports = {
it('Fetch value from function', () => {
view.selectedComponent = component;
var style = {};
style[propName] = 'testfun(' + propValue + ')';
component.set('style', style);
const val = `testfun(${propValue})`;
component.set('style', {[propName]: val});
view.model.set('functionName', 'testfun');
expect(view.getTargetValue()).toEqual(propValue);
expect(view.getTargetValue()).toEqual(val);
});
describe('With target setted', () => {

Loading…
Cancel
Save