From cfa9718df9e0978fa162400e4849137f167f571e Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 28 Feb 2018 23:22:18 +0100 Subject: [PATCH 1/3] Remove window prefix The prefix is unnecessary and prevent usage in web workers. --- src/ol/render/canvas.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ol/render/canvas.js b/src/ol/render/canvas.js index b0c94f6ba4..98734a9659 100644 --- a/src/ol/render/canvas.js +++ b/src/ol/render/canvas.js @@ -167,7 +167,7 @@ export const checkFont = (function() { } } if (done) { - window.clearInterval(interval); + clearInterval(interval); interval = undefined; } } @@ -184,7 +184,7 @@ export const checkFont = (function() { if (!isAvailable(fontFamily)) { checked[fontFamily] = 0; if (interval === undefined) { - interval = window.setInterval(check, 32); + interval = setInterval(check, 32); } } } From f9a27805468754f2e1927a8b95c0f18b01f97c50 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 28 Feb 2018 23:24:53 +0100 Subject: [PATCH 2/3] Do not assume window is defined It is notably not the case in web workers. --- src/ol/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/index.js b/src/ol/index.js index f2e44acc19..377d594239 100644 --- a/src/ol/index.js +++ b/src/ol/index.js @@ -41,7 +41,7 @@ let WEBGL_EXTENSIONS; // value is set below let HAS_WEBGL = false; -if ('WebGLRenderingContext' in window) { +if (typeof window !== 'undefined' && 'WebGLRenderingContext' in window) { try { const canvas = /** @type {HTMLCanvasElement} */ (document.createElement('CANVAS')); From 628094166977799d15e0d21ac6b47eb9862006d1 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 28 Feb 2018 23:28:38 +0100 Subject: [PATCH 3/3] Remove window prefix from event listener functions --- src/ol/PluggableMap.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js index 36780ba8cd..5a20cc4187 100644 --- a/src/ol/PluggableMap.js +++ b/src/ol/PluggableMap.js @@ -507,7 +507,7 @@ PluggableMap.prototype.disposeInternal = function() { unlisten(this.viewport_, EventType.MOUSEWHEEL, this.handleBrowserEvent, this); if (this.handleResize_ !== undefined) { - window.removeEventListener(EventType.RESIZE, + removeEventListener(EventType.RESIZE, this.handleResize_, false); this.handleResize_ = undefined; } @@ -1012,7 +1012,7 @@ PluggableMap.prototype.handleTargetChanged_ = function() { this.renderer_.removeLayerRenderers(); removeNode(this.viewport_); if (this.handleResize_ !== undefined) { - window.removeEventListener(EventType.RESIZE, + removeEventListener(EventType.RESIZE, this.handleResize_, false); this.handleResize_ = undefined; } @@ -1030,7 +1030,7 @@ PluggableMap.prototype.handleTargetChanged_ = function() { if (!this.handleResize_) { this.handleResize_ = this.updateSize.bind(this); - window.addEventListener(EventType.RESIZE, + addEventListener(EventType.RESIZE, this.handleResize_, false); } }