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); }); },