Fixes button handlers event type

This commit is contained in:
Antoine Abt
2014-06-05 11:21:03 +02:00
parent 75cd5572aa
commit 09719bdc70
4 changed files with 96 additions and 33 deletions

View File

@@ -51,9 +51,9 @@ ol.control.Rotate = function(opt_options) {
var handler = new ol.pointer.PointerEventHandler(button);
this.registerDisposable(handler);
goog.events.listen(handler, ol.pointer.EventType.POINTERUP,
ol.control.Rotate.prototype.resetNorth_, false, this);
ol.control.Rotate.prototype.handlePointerUp_, false, this);
goog.events.listen(button, goog.events.EventType.CLICK,
ol.control.Rotate.prototype.resetNorth_, false, this);
ol.control.Rotate.prototype.handleClick_, false, this);
goog.events.listen(button, [
goog.events.EventType.MOUSEOUT,
@@ -90,16 +90,31 @@ goog.inherits(ol.control.Rotate, ol.control.Control);
/**
* @param {ol.pointer.PointerEvent} pointerEvent The pointer event to handle.
* @param {goog.events.BrowserEvent} event The event to handle
* @private
*/
ol.control.Rotate.prototype.resetNorth_ = function(pointerEvent) {
if (goog.isDef(pointerEvent.browserEvent)) {
pointerEvent.browserEvent.preventDefault();
} else if (pointerEvent.screenX !== 0 && pointerEvent.screenY !== 0) {
ol.control.Rotate.prototype.handleClick_ = function(event) {
if (event.screenX !== 0 && event.screenY !== 0) {
return;
}
// prevent the anchor from getting appended to the url
this.resetNorth_();
};
/**
* @param {ol.pointer.PointerEvent} pointerEvent The event to handle
* @private
*/
ol.control.Rotate.prototype.handlePointerUp_ = function(pointerEvent) {
pointerEvent.browserEvent.preventDefault();
this.resetNorth_();
};
/**
* @private
*/
ol.control.Rotate.prototype.resetNorth_ = function() {
var map = this.getMap();
// FIXME works for View2D only
var view = map.getView();