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

Merge pull request #3122 from fredj/revert-2975

Browse Source 
Revert "Use offsetX and offsetY if available"
This commit is contained in:
Frédéric Junod
2015-01-15 10:52:03 +01:00
parent c726cbfcd9 0bae04331d
commit c23ae78978
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ol/map.js
View File

@@ -607,19 +607,12 @@ ol.Map.prototype.getEventCoordinate = function(event) {
* @api stable * @api stable
*/ */
ol.Map.prototype.getEventPixel = function(event) { ol.Map.prototype.getEventPixel = function(event) {
// Use the offsetX and offsetY values if available.
// See http://www.w3.org/TR/cssom-view/#dom-mouseevent-offsetx and
// http://www.w3.org/TR/cssom-view/#dom-mouseevent-offsety
if (goog.isDef(event.offsetX) && goog.isDef(event.offsetY)) {
return [event.offsetX, event.offsetY];
} else if (goog.isDef(event.changedTouches)) {
// offsetX and offsetY are not defined for Touch Event
//
// goog.style.getRelativePosition is based on event.targetTouches, // goog.style.getRelativePosition is based on event.targetTouches,
// but touchend and touchcancel events have no targetTouches when // but touchend and touchcancel events have no targetTouches when
// the last finger is removed from the screen. // the last finger is removed from the screen.
// So we ourselves compute the position of touch events. // So we ourselves compute the position of touch events.
// See https://github.com/google/closure-library/pull/323 // See https://github.com/google/closure-library/pull/323
if (goog.isDef(event.changedTouches)) {
var touch = event.changedTouches[0]; var touch = event.changedTouches[0];
var viewportPosition = goog.style.getClientPosition(this.viewport_); var viewportPosition = goog.style.getClientPosition(this.viewport_);
return [ return [
@@ -627,8 +620,6 @@ ol.Map.prototype.getEventPixel = function(event) {
touch.clientY - viewportPosition.y touch.clientY - viewportPosition.y
]; ];
} else { } else {
// Compute offsetX and offsetY values for browsers that don't implement
// cssom-view specification
var eventPosition = goog.style.getRelativePosition(event, this.viewport_); var eventPosition = goog.style.getRelativePosition(event, this.viewport_);
return [eventPosition.x, eventPosition.y]; return [eventPosition.x, eventPosition.y];
} }