From d1e5337c2d4a3ab3011db1957aa2f1d820594f28 Mon Sep 17 00:00:00 2001
From: Stefan Hayden <alt255@gmail.com>
Date: Tue, 20 Feb 2018 15:53:54 -0500
Subject: [PATCH] ensure canBeSwapped can only be true when a style prop has
 actually been set to a value (#4751)

---
 src/mixins/text_style.mixin.js |  2 +-
 test/unit/text.js              | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/mixins/text_style.mixin.js b/src/mixins/text_style.mixin.js
index 704bdcdb..379f4e48 100644
--- a/src/mixins/text_style.mixin.js
+++ b/src/mixins/text_style.mixin.js
@@ -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]) {
diff --git a/test/unit/text.js b/test/unit/text.js
index 211e32df..b6fd686f 100644
--- a/test/unit/text.js
+++ b/test/unit/text.js
@@ -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' }}};