Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-21 20:01:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

isEqual fails hard. (#4949)

Browse source 
* fix current value null issue
This commit is contained in:
keyurpatel 2018-05-07 14:12:53 -04:00 committed by Andrea Bogazzi
parent abdaffbb24
commit 885545aca8
2 changed files with 47 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mixins/stateful.mixin.js
View file

@ -20,7 +20,7 @@
return true;
}
else if (Array.isArray(origValue)) {
if (origValue.length !== currentValue.length) {
if (!Array.isArray(currentValue) || origValue.length !== currentValue.length) {
return false;
}
for (var i = 0, len = origValue.length; i < len; i++) {
@ -32,7 +32,10 @@
}
else if (origValue && typeof origValue === 'object') {
var keys = Object.keys(origValue), key;
if (!firstPass && keys.length !== Object.keys(currentValue).length) {
if (!currentValue ||
typeof currentValue !== 'object' ||
(!firstPass && keys.length !== Object.keys(currentValue).length)
) {
return false;
}
for (var i = 0, len = keys.length; i < len; i++) {

44
test/unit/stateful.js
View file

@ -1,7 +1,6 @@
(function(){
QUnit.module('fabric.stateful');
QUnit.test('hasStateChanged', function(assert) {
var cObj = new fabric.Object();
assert.ok(typeof cObj.hasStateChanged === 'function');
@ -53,6 +52,20 @@
assert.ok(cObj.hasStateChanged(), 'more properties added');
});
QUnit.test('saveState with array to null', function(assert) {
var cObj = new fabric.Text('Hello');
cObj.set('strokeDashArray', [0, 4]);
cObj.setupState();
//eqaul(cObj.underline, cObj._stateProperties.underline, 'textDecoration in state is deepEqual');
//notEqual(cObj.textDecoration, cObj._stateProperties.textDecoration, 'textDecoration in not same Object');
cObj.strokeDashArray = null;
assert.ok(cObj.hasStateChanged(), 'hasStateChanged detects changes in array without throwing');
cObj.saveState();
cObj.strokeDashArray = [2, 3];
assert.ok(cObj.hasStateChanged(), 'back to array');
});
QUnit.test('saveState with fabric class gradient', function(assert) {
var cObj = new fabric.Object();
var gradient = new fabric.Gradient({
@ -84,6 +97,34 @@
assert.ok(cObj.hasStateChanged(), 'hasStateChanged detects changes in nested props on third level of nesting');
});
QUnit.test('saveState with fabric class gradient to other types', function(assert) {
var cObj = new fabric.Object();
var gradient = new fabric.Gradient({
type: 'linear',
coords: {
x1: 0,
y1: 10,
x2: 100,
y2: 200,
},
colorStops: [
{ offset: 0, color: 'red', opacity: 0 },
{ offset: 1, color: 'green' }
]
});
cObj.set('fill', gradient);
cObj.setupState();
cObj.set('fill', 'red');
assert.ok(cObj.hasStateChanged(), 'hasStateChanged detects changes in object to string without throwing');
cObj.saveState();
cObj.set('fill', gradient);
assert.ok(cObj.hasStateChanged(), 'back to gradient');
cObj.saveState();
cObj.set('fill', null);
assert.ok(cObj.hasStateChanged(), 'hasStateChanged detects changes in object to null without throwing');
});
QUnit.test('savestate with custom property set', function(assert) {
var cObj = new fabric.Object();
cObj.myProperties = ['a', 'b'];
@ -99,5 +140,4 @@
cObj.a = 2;
assert.ok(cObj.hasStateChanged('myProperties'), 'custom state has changed');
});
})();