Skip to content

Commit 12c2724

Browse files
committed
additional typeof test to stop referencing an undefined window
1 parent f607f8f commit 12c2724

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import {getVersionString} from './src/core/Version';
3737

3838

3939
// Shove both of these into the global scope
40-
var context = window || global;
40+
var context = (typeof window !== 'undefined' && window) || global;
4141

4242
var dashjs = context.dashjs;
4343
if (!dashjs) {
@@ -52,4 +52,4 @@ dashjs.Version = getVersionString();
5252

5353

5454
export default dashjs;
55-
export { MediaPlayer, Protection, MetricsReporting, MediaPlayerFactory};
55+
export { MediaPlayer, Protection, MetricsReporting, MediaPlayerFactory};

src/streaming/MediaPlayerFactory.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ function loadHandler() {
100100
instance.createAll();
101101
}
102102

103-
let avoidAutoCreate = window && window.dashjs && window.dashjs.skipAutoCreate;
103+
let avoidAutoCreate = typeof window !== 'undefined' && window && window.dashjs && window.dashjs.skipAutoCreate;
104104

105-
if (!avoidAutoCreate && window && window.addEventListener) {
105+
if (!avoidAutoCreate && typeof window !== 'undefined' && window && window.addEventListener) {
106106
if (window.document.readyState === 'complete') {
107107
instance.createAll();
108108
} else {

0 commit comments

Comments
 (0)