Преглед на файлове

Replace object.assign with jQuery extend

Angus McLeod преди 6 години
родител
ревизия
0bb1660b6b
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2 2
      assets/javascripts/discourse/models/custom-wizard.js.es6
  2. 1 1
      assets/javascripts/wizard/routes/custom.js.es6

+ 2 - 2
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);
             });
           }

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