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

ensure canBeSwapped can only be true when a style prop has actually been set to a value (#4751)

Browse source
This commit is contained in:
Stefan Hayden 2018-02-20 15:53:54 -05:00 committed by Andrea Bogazzi
parent d569407d3a
commit d1e5337c2d
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mixins/text_style.mixin.js
View file

@ -75,7 +75,7 @@
style = obj[p1][p2][property];
foundStyle = true;
}
else if (obj[p1][p2][property] !== style) {
else if (obj[p1][p2][property] !== style || !obj[p1][p2].hasOwnProperty(property)) {
canBeSwapped = false;
}
if (obj[p1][p2][property] === this[property]) {

34
test/unit/text.js
View file

@ -336,6 +336,26 @@
assert.equal(text.styles[1][0].stroke, 'blue', 'nothing to clean, style untouched');
});
QUnit.test('text cleanStyle with different sub styles styles', function(assert) {
var text = new fabric.Text('xxxxxx\nx y');
text.styles = { 1: { 0: { fill: 'red' }, 1: { stroke: 'red' }}};
text.stroke = 'red';
text.cleanStyle('stroke');
assert.equal(text.stroke, 'red', 'the stroke stays red');
assert.equal(text.styles[1][0].fill, 'red', 'the style has not been changed since it\'s a different property');
assert.equal(text.styles[1][0].stroke, undefined, 'the style has been cleaned since stroke was equal to text property');
assert.equal(text.styles[1][1], undefined, 'the style remains undefined');
});
QUnit.test('text cleanStyle with undefined and set styles', function(assert) {
var text = new fabric.Text('xxxxxx\nx y');
text.styles = { 1: { 1: { stroke: 'red' }, 3: { stroke: 'red' }}};
text.stroke = 'red';
text.cleanStyle('stroke');
assert.equal(text.stroke, 'red', 'the stroke stays red');
assert.equal(text.styles[1], undefined, 'the style has been cleaned since stroke was equal to text property');
});
QUnit.test('text cleanStyle with empty styles', function(assert) {
var text = new fabric.Text('xxxxxx\nx y');
text.styles = { 1: { 0: { }, 1: { }}, 2: { }, 3: { 4: { }}};
@ -354,6 +374,20 @@
assert.equal(text.styles[0], undefined, 'all the style has been removed');
});
QUnit.test('text cleanStyle with no relevant style', function(assert) {
var text = new fabric.Text('xxx');
text.styles = { 0: { 0: { other: 'value1' }, 1: { other: 'value2' }, 2: { other: 'value3' }}};
text.fill = 'black';
text.cleanStyle('fill');
assert.equal(text.fill, 'black', 'the fill remains black');
assert.equal(text.styles[0][0].other, 'value1', 'style remains the same');
assert.equal(text.styles[0][0].full, undefined, 'style remains undefined');
assert.equal(text.styles[0][1].other, 'value2', 'style remains the same');
assert.equal(text.styles[0][1].full, undefined, 'style remains undefined');
assert.equal(text.styles[0][2].other, 'value3', 'style remains the same');
assert.equal(text.styles[0][2].full, undefined, 'style remains undefined');
});
QUnit.test('text removeStyle with some style', function(assert) {
var text = new fabric.Text('xxx');
text.styles = { 0: { 0: { stroke: 'black', fill: 'blue' }, 1: { fill: 'blue' }, 2: { fill: 'blue' }}};