Replace object.assign with jQuery extend
Dieser Commit ist enthalten in:
Ursprung
6fab152930
Commit
0bb1660b6b
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
|
@ -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);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
});
|
||||
},
|
||||
|
||||
|
|
Laden …
In neuem Issue referenzieren