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

Use no browser globals at all

Browse Source
This commit is contained in:
ahocevar
2013-04-10 16:53:45 +02:00
parent dc1d7a1aba
commit a437bea61f
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/browserfeature.js
View File

@@ -16,6 +16,7 @@ ol.BrowserFeature = {
* @type {boolean} * @type {boolean}
*/ */
HAS_TOUCH: ol.ASSUME_TOUCH || 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) !!(goog.global.navigator.msPointerEnabled)
}; };

4
src/ol/geolocation.js
View File

@@ -95,12 +95,12 @@ ol.Geolocation.prototype.handleTrackingChanged_ = function() {
if (ol.Geolocation.SUPPORTED) { if (ol.Geolocation.SUPPORTED) {
var tracking = this.getTracking(); var tracking = this.getTracking();
if (tracking && !goog.isDef(this.watchId_)) { 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.positionChange_, this),
goog.bind(this.positionError_, this), goog.bind(this.positionError_, this),
this.getTrackingOptions()); this.getTrackingOptions());
} else if (!tracking && goog.isDef(this.watchId_)) { } else if (!tracking && goog.isDef(this.watchId_)) {
navigator.geolocation.clearWatch(this.watchId_); goog.global.navigator.geolocation.clearWatch(this.watchId_);
this.watchId_ = undefined; this.watchId_ = undefined;
} }
} }

2
src/ol/map.js
View File

@@ -230,7 +230,7 @@ ol.Map = function(options) {
this.registerDisposable(mapBrowserEventHandler); this.registerDisposable(mapBrowserEventHandler);
// FIXME we probably shouldn't listen on document... // 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, goog.events.listen(keyHandler, goog.events.KeyHandler.EventType.KEY,
this.handleBrowserEvent, false, this); this.handleBrowserEvent, false, this);
this.registerDisposable(keyHandler); this.registerDisposable(keyHandler);

4
src/ol/mapbrowserevent.js
View File

@@ -248,9 +248,9 @@ ol.MapBrowserEventHandler.prototype.handleMouseDown_ = function(browserEvent) {
}; };
this.dragged_ = false; this.dragged_ = false;
this.dragListenerKeys_ = [ this.dragListenerKeys_ = [
goog.events.listen(document, goog.events.EventType.MOUSEMOVE, goog.events.listen(goog.global.document, goog.events.EventType.MOUSEMOVE,
this.handleMouseMove_, false, this), 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) this.handleMouseUp_, false, this)
]; ];
// prevent browser image dragging with the dom renderer // prevent browser image dragging with the dom renderer