ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7914 from gberaudo/some_easy_window_cleanups

Browse Source 
Some easy window cleanups
This commit is contained in:
Tim Schaub
2018-03-03 13:04:30 -07:00
committed by GitHub
parent d0a8ae718e 6280941669
commit b3d915629e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/PluggableMap.js
View File

@@ -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;
}
@@ -1010,7 +1010,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;
}
@@ -1028,7 +1028,7 @@ PluggableMap.prototype.handleTargetChanged_ = function() {
if (!this.handleResize_) {
this.handleResize_ = this.updateSize.bind(this);
window.addEventListener(EventType.RESIZE,
addEventListener(EventType.RESIZE,
this.handleResize_, false);
}
}

2
src/ol/index.js
View File

@@ -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'));
const gl = getContext(canvas, {failIfMajorPerformanceCaveat: true});

4
src/ol/render/canvas.js
View File

@@ -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);
}
}
}