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

Read pointerId/pointerType from browser event

Browse Source 
and not from the Google Closure event.
This commit is contained in:
tsauerwein
2014-03-11 14:41:40 +01:00
parent aee76c989d
commit 4468d96a13
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/pointer/mssource.js
+6 -6
View File
@@ -102,9 +102,9 @@ ol.pointer.MsSource.prototype.getMapping = function() {
*/ */
ol.pointer.MsSource.prototype.prepareEvent_ = function(inEvent) { ol.pointer.MsSource.prototype.prepareEvent_ = function(inEvent) {
var e = inEvent; var e = inEvent;
if (goog.isNumber(inEvent.pointerType)) { if (goog.isNumber(inEvent.getBrowserEvent().pointerType)) {
e = this.dispatcher.cloneEvent(inEvent, inEvent.getBrowserEvent()); e = this.dispatcher.cloneEvent(inEvent, inEvent.getBrowserEvent());
e.pointerType = this.POINTER_TYPES[inEvent.pointerType]; e.pointerType = this.POINTER_TYPES[inEvent.getBrowserEvent().pointerType];
} }
return e; return e;
@@ -112,7 +112,7 @@ ol.pointer.MsSource.prototype.prepareEvent_ = function(inEvent) {
/** /**
* Remove the mouse from the list of active pointers. * Remove this pointer from the list of active pointers.
* @param {number} pointerId * @param {number} pointerId
*/ */
ol.pointer.MsSource.prototype.cleanup = function(pointerId) { ol.pointer.MsSource.prototype.cleanup = function(pointerId) {
@@ -126,7 +126,7 @@ ol.pointer.MsSource.prototype.cleanup = function(pointerId) {
* @param {goog.events.BrowserEvent} inEvent * @param {goog.events.BrowserEvent} inEvent
*/ */
ol.pointer.MsSource.prototype.msPointerDown = function(inEvent) { ol.pointer.MsSource.prototype.msPointerDown = function(inEvent) {
this.pointerMap.set(inEvent.pointerId, inEvent); this.pointerMap.set(inEvent.getBrowserEvent().pointerId, inEvent);
var e = this.prepareEvent_(inEvent); var e = this.prepareEvent_(inEvent);
this.dispatcher.down(e, inEvent); this.dispatcher.down(e, inEvent);
}; };
@@ -151,7 +151,7 @@ ol.pointer.MsSource.prototype.msPointerMove = function(inEvent) {
ol.pointer.MsSource.prototype.msPointerUp = function(inEvent) { ol.pointer.MsSource.prototype.msPointerUp = function(inEvent) {
var e = this.prepareEvent_(inEvent); var e = this.prepareEvent_(inEvent);
this.dispatcher.up(e, inEvent); this.dispatcher.up(e, inEvent);
this.cleanup(inEvent.pointerId); this.cleanup(inEvent.getBrowserEvent().pointerId);
}; };
@@ -185,7 +185,7 @@ ol.pointer.MsSource.prototype.msPointerOver = function(inEvent) {
ol.pointer.MsSource.prototype.msPointerCancel = function(inEvent) { ol.pointer.MsSource.prototype.msPointerCancel = function(inEvent) {
var e = this.prepareEvent_(inEvent); var e = this.prepareEvent_(inEvent);
this.dispatcher.cancel(e, inEvent); this.dispatcher.cancel(e, inEvent);
this.cleanup(inEvent.pointerId); this.cleanup(inEvent.getBrowserEvent().pointerId);
}; };