Skip to content

Commit d660439

Browse files
authored
Merge pull request #302 from mehulkar/patch-1
Replace Ember.assign usage with Object.assign
2 parents 5764f8d + 6420de2 commit d660439

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

addon/services/in-viewport.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import Service from '@ember/service';
22
import { set, setProperties } from '@ember/object';
3-
import { assign } from '@ember/polyfills';
43
import { getOwner } from '@ember/application';
54
import { warn } from '@ember/debug';
65
import { schedule } from '@ember/runloop';
@@ -25,15 +24,15 @@ export default class InViewport extends Service {
2524

2625
set(this, 'registry', new WeakMap());
2726

28-
let options = assign(
27+
let options = Object.assign(
2928
{
3029
viewportUseRAF: canUseRAF(),
3130
},
3231
this._buildOptions()
3332
);
3433

3534
// set viewportUseIntersectionObserver after merging users config to avoid errors in browsers that lack support (https://github.com/DockYard/ember-in-viewport/issues/146)
36-
options = assign(options, {
35+
options = Object.assign(options, {
3736
viewportUseIntersectionObserver: canUseIntersectionObserver(),
3837
});
3938

@@ -239,7 +238,7 @@ export default class InViewport extends Service {
239238
const owner = getOwner(this);
240239

241240
if (owner) {
242-
return assign(defaultOptions, owner.lookup('config:in-viewport'));
241+
return Object.assign(defaultOptions, owner.lookup('config:in-viewport'));
243242
}
244243
}
245244

addon/utils/is-in-viewport.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { assign } from '@ember/polyfills';
2-
31
const defaultTolerance = {
42
top: 0,
53
left: 0,
@@ -14,7 +12,10 @@ export default function isInViewport(
1412
tolerance = defaultTolerance
1513
) {
1614
const { top, left, bottom, right, height: h, width: w } = boundingClientRect;
17-
const tolerances = assign(assign({}, defaultTolerance), tolerance);
15+
const tolerances = Object.assign(
16+
Object.assign({}, defaultTolerance),
17+
tolerance
18+
);
1819
const {
1920
top: topTolerance,
2021
left: leftTolerance,

0 commit comments

Comments
 (0)