From a437bea61fae07169262e4328c5e562fe3c3d707 Mon Sep 17 00:00:00 2001 From: ahocevar Date: Wed, 10 Apr 2013 16:53:45 +0200 Subject: [PATCH] Use no browser globals at all --- src/ol/browserfeature.js | 3 ++- src/ol/geolocation.js | 4 ++-- src/ol/map.js | 2 +- src/ol/mapbrowserevent.js | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ol/browserfeature.js b/src/ol/browserfeature.js index 7a0740efe1..527a709873 100644 --- a/src/ol/browserfeature.js +++ b/src/ol/browserfeature.js @@ -16,6 +16,7 @@ ol.BrowserFeature = { * @type {boolean} */ HAS_TOUCH: ol.ASSUME_TOUCH || - (goog.global.document && 'ontouchstart' in document.documentElement) || + (goog.global.document && + 'ontouchstart' in goog.global.document.documentElement) || !!(goog.global.navigator.msPointerEnabled) }; diff --git a/src/ol/geolocation.js b/src/ol/geolocation.js index cf45c21b13..a619db1b1f 100644 --- a/src/ol/geolocation.js +++ b/src/ol/geolocation.js @@ -95,12 +95,12 @@ ol.Geolocation.prototype.handleTrackingChanged_ = function() { if (ol.Geolocation.SUPPORTED) { var tracking = this.getTracking(); if (tracking && !goog.isDef(this.watchId_)) { - this.watchId_ = navigator.geolocation.watchPosition( + this.watchId_ = goog.global.navigator.geolocation.watchPosition( goog.bind(this.positionChange_, this), goog.bind(this.positionError_, this), this.getTrackingOptions()); } else if (!tracking && goog.isDef(this.watchId_)) { - navigator.geolocation.clearWatch(this.watchId_); + goog.global.navigator.geolocation.clearWatch(this.watchId_); this.watchId_ = undefined; } } diff --git a/src/ol/map.js b/src/ol/map.js index c6026a7e7f..b40e08a208 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -230,7 +230,7 @@ ol.Map = function(options) { this.registerDisposable(mapBrowserEventHandler); // FIXME we probably shouldn't listen on document... - var keyHandler = new goog.events.KeyHandler(document); + var keyHandler = new goog.events.KeyHandler(goog.global.document); goog.events.listen(keyHandler, goog.events.KeyHandler.EventType.KEY, this.handleBrowserEvent, false, this); this.registerDisposable(keyHandler); diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index 3afa2f6d71..108458b198 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -248,9 +248,9 @@ ol.MapBrowserEventHandler.prototype.handleMouseDown_ = function(browserEvent) { }; this.dragged_ = false; this.dragListenerKeys_ = [ - goog.events.listen(document, goog.events.EventType.MOUSEMOVE, + goog.events.listen(goog.global.document, goog.events.EventType.MOUSEMOVE, this.handleMouseMove_, false, this), - goog.events.listen(document, goog.events.EventType.MOUSEUP, + goog.events.listen(goog.global.document, goog.events.EventType.MOUSEUP, this.handleMouseUp_, false, this) ]; // prevent browser image dragging with the dom renderer