From 0bb1660b6b63b190f6b5bd4c5f7d50596bc4c142 Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Thu, 14 Jun 2018 09:59:41 +1000
Subject: [PATCH] Replace object.assign with jQuery extend

---
 assets/javascripts/discourse/models/custom-wizard.js.es6 | 4 ++--
 assets/javascripts/wizard/routes/custom.js.es6           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/javascripts/discourse/models/custom-wizard.js.es6 b/assets/javascripts/discourse/models/custom-wizard.js.es6
index 5c09ace1..fa550bb5 100644
--- a/assets/javascripts/discourse/models/custom-wizard.js.es6
+++ b/assets/javascripts/discourse/models/custom-wizard.js.es6
@@ -200,7 +200,7 @@ CustomWizard.reopenClass({
               Object.keys(f).forEach((key) => (f[key] === '') && delete f[key]);
 
               const fieldParams = { isNew: false };
-              let field = Ember.Object.create(Object.assign(f, fieldParams));
+              let field = Ember.Object.create($.extend(f, fieldParams));
 
               if (f.choices) {
                 let choices = Ember.A();
@@ -220,7 +220,7 @@ CustomWizard.reopenClass({
           if (s.actions && s.actions.length) {
             s.actions.forEach((a) => {
               const actionParams = { isNew: false };
-              const action = Ember.Object.create(Object.assign(a, actionParams));
+              const action = Ember.Object.create($.extend(a, actionParams));
               actions.pushObject(action);
             });
           }
diff --git a/assets/javascripts/wizard/routes/custom.js.es6 b/assets/javascripts/wizard/routes/custom.js.es6
index 0af1d67f..6fe86a21 100644
--- a/assets/javascripts/wizard/routes/custom.js.es6
+++ b/assets/javascripts/wizard/routes/custom.js.es6
@@ -13,7 +13,7 @@ export default Ember.Route.extend({
       url: `/site/settings`,
       type: 'GET',
     }).then((result) => {
-      Object.assign(Wizard.SiteSettings, result);
+      $.extend(Wizard.SiteSettings, result);
     });
   },