From 3a8b64e11c37a7ef9a5816aa54efdb014838b817 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rostislav.wolny@sygictravel.com>
Date: Wed, 14 Mar 2018 20:15:18 +0100
Subject: [PATCH] editor: Omit text property from block defaults for header and
 footer

---
 assets/js/src/newsletter_editor/blocks/footer.js         | 3 +++
 assets/js/src/newsletter_editor/blocks/header.js         | 3 +++
 tests/javascript/newsletter_editor/blocks/footer.spec.js | 4 +++-
 tests/javascript/newsletter_editor/blocks/header.spec.js | 4 +++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/assets/js/src/newsletter_editor/blocks/footer.js b/assets/js/src/newsletter_editor/blocks/footer.js
index be5f8378e1..bb247dd6b0 100644
--- a/assets/js/src/newsletter_editor/blocks/footer.js
+++ b/assets/js/src/newsletter_editor/blocks/footer.js
@@ -33,6 +33,9 @@ define([
           }
         }
       }, App.getConfig().get('blockDefaults.footer'));
+    },
+    _updateDefaults: function updateDefaults() {
+      App.getConfig().set('blockDefaults.footer', _.omit(this.toJSON(), 'text'));
     }
   });
 
diff --git a/assets/js/src/newsletter_editor/blocks/header.js b/assets/js/src/newsletter_editor/blocks/header.js
index c523f0db88..d81c6f0dad 100644
--- a/assets/js/src/newsletter_editor/blocks/header.js
+++ b/assets/js/src/newsletter_editor/blocks/header.js
@@ -33,6 +33,9 @@ define([
           }
         }
       }, App.getConfig().get('blockDefaults.header'));
+    },
+    _updateDefaults: function updateDefaults() {
+      App.getConfig().set('blockDefaults.header', _.omit(this.toJSON(), 'text'));
     }
   });
 
diff --git a/tests/javascript/newsletter_editor/blocks/footer.spec.js b/tests/javascript/newsletter_editor/blocks/footer.spec.js
index 0be258173d..a22d7ffba3 100644
--- a/tests/javascript/newsletter_editor/blocks/footer.spec.js
+++ b/tests/javascript/newsletter_editor/blocks/footer.spec.js
@@ -125,7 +125,9 @@ define([
         model.trigger('change');
         expect(stub.callCount).to.equal(1);
         expect(stub.getCall(0).args[0]).to.equal('blockDefaults.footer');
-        expect(stub.getCall(0).args[1]).to.deep.equal(model.toJSON());
+        expect(stub.getCall(0).args[1].type).to.equal(model.toJSON().type);
+        expect(stub.getCall(0).args[1].styles).to.deep.equal(model.toJSON().styles);
+        expect(stub.getCall(0).args[1].text).to.equal(undefined);
       });
     });
 
diff --git a/tests/javascript/newsletter_editor/blocks/header.spec.js b/tests/javascript/newsletter_editor/blocks/header.spec.js
index b4c7e62da9..9624dae9e1 100644
--- a/tests/javascript/newsletter_editor/blocks/header.spec.js
+++ b/tests/javascript/newsletter_editor/blocks/header.spec.js
@@ -124,7 +124,9 @@ define([
         model.trigger('change');
         expect(stub.callCount).to.equal(1);
         expect(stub.getCall(0).args[0]).to.equal('blockDefaults.header');
-        expect(stub.getCall(0).args[1]).to.deep.equal(model.toJSON());
+        expect(stub.getCall(0).args[1].type).to.equal(model.toJSON().type);
+        expect(stub.getCall(0).args[1].styles).to.deep.equal(model.toJSON().styles);
+        expect(stub.getCall(0).args[1].text).to.equal(undefined);
       });
     });