0
0
Fork 1
Spiegel von https://github.com/paviliondev/discourse-custom-wizard.git synchronisiert 2024-11-10 04:12:53 +01:00

Replace object.assign with jQuery extend

Dieser Commit ist enthalten in:
Angus McLeod 2018-06-14 09:59:41 +10:00
Ursprung 6fab152930
Commit 0bb1660b6b
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -200,7 +200,7 @@ CustomWizard.reopenClass({
Object.keys(f).forEach((key) => (f[key] === '') && delete f[key]); Object.keys(f).forEach((key) => (f[key] === '') && delete f[key]);
const fieldParams = { isNew: false }; const fieldParams = { isNew: false };
let field = Ember.Object.create(Object.assign(f, fieldParams)); let field = Ember.Object.create($.extend(f, fieldParams));
if (f.choices) { if (f.choices) {
let choices = Ember.A(); let choices = Ember.A();
@ -220,7 +220,7 @@ CustomWizard.reopenClass({
if (s.actions && s.actions.length) { if (s.actions && s.actions.length) {
s.actions.forEach((a) => { s.actions.forEach((a) => {
const actionParams = { isNew: false }; const actionParams = { isNew: false };
const action = Ember.Object.create(Object.assign(a, actionParams)); const action = Ember.Object.create($.extend(a, actionParams));
actions.pushObject(action); actions.pushObject(action);
}); });
} }

Datei anzeigen

@ -13,7 +13,7 @@ export default Ember.Route.extend({
url: `/site/settings`, url: `/site/settings`,
type: 'GET', type: 'GET',
}).then((result) => { }).then((result) => {
Object.assign(Wizard.SiteSettings, result); $.extend(Wizard.SiteSettings, result);
}); });
}, },