Skip to content

Commit fef1b52

Browse files
committed
Use assign instead or merge and copy
1 parent 668d7d7 commit fef1b52

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

addon/mixins/adaptable.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import requiredMethod from 'ember-cli-adapter-pattern/utils/required-method';
55
import { assert } from '@ember/debug';
66
import { get, set } from '@ember/object';
77
import { on } from '@ember/object/evented';
8-
import { copy } from '@ember/object/internals';
9-
import { merge } from '@ember/polyfills';
8+
import { assign } from '@ember/polyfills';
109
import { hash, resolve } from 'rsvp';
1110

1211
export default Mixin.create({
@@ -97,8 +96,8 @@ export default Mixin.create({
9796
const cachedAdapters = get(this, '_adapters');
9897
const adapterNames = Object.keys(cachedAdapters);
9998
const [selectedAdapterNames, options] = args.length > 1 ? [[args[0]], args[1]] : [adapterNames, args[0]];
100-
const context = copy(get(this, 'context'));
101-
const mergedOptions = merge(context, options);
99+
const context = get(this, 'context');
100+
const mergedOptions = assign({}, context, options);
102101

103102
// Store a promise for each adapter response.
104103
const promises = {};

0 commit comments

Comments
 (0)