Skip to content

Commit 43a2358

Browse files
authored
fix: use object spread operator to replace Ember.assign and fix deprecation (#12)
1 parent 4e49fdb commit 43a2358

2 files changed

Lines changed: 11 additions & 17 deletions

File tree

addon/-private/utils/prepare-options.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import { assign } from '@ember/polyfills';
2-
3-
41
// Prepares options for template helpers
52
export default function prepareOptions(options) {
6-
let newOptions = assign({silenceErrors: true}, options);
3+
let newOptions = { silenceErrors: true, ...options };
74
// newOptions.remote = remote;
85
// if (!newOptions.metadata) {
96
// newOptions.metadata = metadata;

addon/services/stereo.js

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
waitForEvent,
1111
didCancel,
1212
} from 'ember-concurrency';
13-
import { assign } from '@ember/polyfills';
1413
import { cancel, later, next } from '@ember/runloop';
1514
import { isTesting, macroCondition } from '@embroider/macros';
1615
import canAutoplay from 'can-autoplay';
@@ -364,16 +363,14 @@ export default class Stereo extends Service.extend(EmberEvented) {
364363
*/
365364

366365
prepareLoadOptions(options) {
367-
return assign(
368-
{
369-
metadata: {},
370-
sharedAudioAccess: this._createAndUnlockAudio(),
371-
useSharedAudioAccess: this.useSharedAudioAccess,
372-
isMobileDevice: this.isMobileDevice,
373-
connections: this.connectionLoader.connections,
374-
},
375-
options
376-
);
366+
return {
367+
metadata: {},
368+
sharedAudioAccess: this._createAndUnlockAudio(),
369+
useSharedAudioAccess: this.useSharedAudioAccess,
370+
isMobileDevice: this.isMobileDevice,
371+
connections: this.connectionLoader.connections,
372+
...options,
373+
};
377374
}
378375

379376
@task({ restartable: true, evented: true })
@@ -496,7 +493,7 @@ export default class Stereo extends Service.extend(EmberEvented) {
496493
*/
497494

498495
load(urlsOrPromise, options) {
499-
options = assign({ metadata: {} }, options);
496+
options = { metadata: {}, ...options };
500497

501498
try {
502499
let promise = this.loadTask.perform(urlsOrPromise, options);
@@ -527,7 +524,7 @@ export default class Stereo extends Service.extend(EmberEvented) {
527524

528525
@task({ restartable: true })
529526
*playTask(urlsOrPromise, options = {}) {
530-
options = assign({ metadata: {} }, options);
527+
options = { metadata: {}, ...options };
531528

532529
let previouslyPlayingSound = this.isPlaying ? this.currentSound : false;
533530

0 commit comments

Comments
 (0)