Skip to content

Commit c72480a

Browse files
committed
Merge branch 'hotfix/1.0.0-alpha.12' into master
2 parents e346eb6 + f3a1d58 commit c72480a

File tree

5 files changed

+45
-9
lines changed

5 files changed

+45
-9
lines changed

dist/services/resize.js

Lines changed: 23 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/services/resize.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@studiometa/js-toolkit",
3-
"version": "1.0.0-alpha.11",
3+
"version": "1.0.0-alpha.12",
44
"description": "",
55
"scripts": {
66
"prepublishOnly": "if [[ ! $PWD =~ dist$ ]]; then echo '🚧 Use `npm run deploy` instead of `npm publish`!' && echo '' && exit 1; fi",

src/services/resize.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@ class Resize extends Service {
2323
this.trigger(this.props);
2424
}).bind(this);
2525

26-
this.resizeObserver = new ResizeObserver(this.handler);
27-
this.resizeObserver.observe(document.documentElement);
26+
if (this.canUseResizeObserver) {
27+
this.resizeObserver = new ResizeObserver(this.handler);
28+
this.resizeObserver.observe(document.documentElement);
29+
} else {
30+
window.addEventListener('resize', this.handler);
31+
}
2832
}
2933

3034
/**
@@ -33,7 +37,11 @@ class Resize extends Service {
3337
* @return {void}
3438
*/
3539
kill() {
36-
this.resizeObserver.disconnect();
40+
if (this.canUseResizeObserver) {
41+
this.resizeObserver.disconnect();
42+
} else {
43+
window.removeEventListener('resize', this.handler);
44+
}
3745
delete this.resizeObserver;
3846
}
3947

@@ -97,6 +105,14 @@ class Resize extends Service {
97105

98106
return breakpoints.split(',');
99107
}
108+
109+
/**
110+
* Test if we can use the `ResizeObserver` API.
111+
* @return {Boolean}
112+
*/
113+
get canUseResizeObserver() {
114+
return typeof window.ResizeObserver !== 'undefined';
115+
}
100116
}
101117

102118
let resize = null;

0 commit comments

Comments
 (0)