Restore control’s keyboard navigation

This commit is contained in:
Antoine Abt
2014-06-04 16:55:02 +02:00
parent 1d2543ba6f
commit 75cd5572aa
4 changed files with 32 additions and 4 deletions

View File

@@ -52,6 +52,8 @@ ol.control.FullScreen = function(opt_options) {
this.registerDisposable(buttonHandler); this.registerDisposable(buttonHandler);
goog.events.listen(buttonHandler, goog.events.listen(buttonHandler,
ol.pointer.EventType.POINTERUP, this.handleClick_, false, this); ol.pointer.EventType.POINTERUP, this.handleClick_, false, this);
goog.events.listen(button, goog.events.EventType.CLICK,
this.handleClick_, false, this);
goog.events.listen(button, [ goog.events.listen(button, [
goog.events.EventType.MOUSEOUT, goog.events.EventType.MOUSEOUT,
@@ -92,7 +94,11 @@ ol.control.FullScreen.prototype.handleClick_ = function(pointerEvent) {
if (!googx.dom.fullscreen.isSupported()) { if (!googx.dom.fullscreen.isSupported()) {
return; return;
} }
pointerEvent.browserEvent.preventDefault(); if (goog.isDef(pointerEvent.browserEvent)) {
pointerEvent.browserEvent.preventDefault();
} else if (pointerEvent.screenX !== 0 && pointerEvent.screenY !== 0) {
return;
}
var map = this.getMap(); var map = this.getMap();
if (goog.isNull(map)) { if (goog.isNull(map)) {
return; return;

View File

@@ -52,6 +52,8 @@ ol.control.Rotate = function(opt_options) {
this.registerDisposable(handler); this.registerDisposable(handler);
goog.events.listen(handler, ol.pointer.EventType.POINTERUP, goog.events.listen(handler, ol.pointer.EventType.POINTERUP,
ol.control.Rotate.prototype.resetNorth_, false, this); ol.control.Rotate.prototype.resetNorth_, false, this);
goog.events.listen(button, goog.events.EventType.CLICK,
ol.control.Rotate.prototype.resetNorth_, false, this);
goog.events.listen(button, [ goog.events.listen(button, [
goog.events.EventType.MOUSEOUT, goog.events.EventType.MOUSEOUT,
@@ -92,7 +94,11 @@ goog.inherits(ol.control.Rotate, ol.control.Control);
* @private * @private
*/ */
ol.control.Rotate.prototype.resetNorth_ = function(pointerEvent) { ol.control.Rotate.prototype.resetNorth_ = function(pointerEvent) {
pointerEvent.browserEvent.preventDefault(); if (goog.isDef(pointerEvent.browserEvent)) {
pointerEvent.browserEvent.preventDefault();
} else if (pointerEvent.screenX !== 0 && pointerEvent.screenY !== 0) {
return;
}
// prevent the anchor from getting appended to the url // prevent the anchor from getting appended to the url
var map = this.getMap(); var map = this.getMap();
// FIXME works for View2D only // FIXME works for View2D only

View File

@@ -56,6 +56,9 @@ ol.control.Zoom = function(opt_options) {
goog.events.listen(inElementHandler, goog.events.listen(inElementHandler,
ol.pointer.EventType.POINTERUP, goog.partial( ol.pointer.EventType.POINTERUP, goog.partial(
ol.control.Zoom.prototype.zoomByDelta_, delta), false, this); ol.control.Zoom.prototype.zoomByDelta_, delta), false, this);
goog.events.listen(inElement,
goog.events.EventType.CLICK, goog.partial(
ol.control.Zoom.prototype.zoomByDelta_, delta), false, this);
goog.events.listen(inElement, [ goog.events.listen(inElement, [
goog.events.EventType.MOUSEOUT, goog.events.EventType.MOUSEOUT,
@@ -77,6 +80,9 @@ ol.control.Zoom = function(opt_options) {
goog.events.listen(outElementHandler, goog.events.listen(outElementHandler,
ol.pointer.EventType.POINTERUP, goog.partial( ol.pointer.EventType.POINTERUP, goog.partial(
ol.control.Zoom.prototype.zoomByDelta_, -delta), false, this); ol.control.Zoom.prototype.zoomByDelta_, -delta), false, this);
goog.events.listen(outElement,
goog.events.EventType.CLICK, goog.partial(
ol.control.Zoom.prototype.zoomByDelta_, -delta), false, this);
goog.events.listen(outElement, [ goog.events.listen(outElement, [
goog.events.EventType.MOUSEOUT, goog.events.EventType.MOUSEOUT,
@@ -111,7 +117,11 @@ goog.inherits(ol.control.Zoom, ol.control.Control);
* @private * @private
*/ */
ol.control.Zoom.prototype.zoomByDelta_ = function(delta, pointerEvent) { ol.control.Zoom.prototype.zoomByDelta_ = function(delta, pointerEvent) {
pointerEvent.browserEvent.preventDefault(); if (goog.isDef(pointerEvent.browserEvent)) {
pointerEvent.browserEvent.preventDefault();
} else if (pointerEvent.screenX !== 0 && pointerEvent.screenY !== 0) {
return;
}
// prevent the anchor from getting appended to the url // prevent the anchor from getting appended to the url
var map = this.getMap(); var map = this.getMap();
// FIXME works for View2D only // FIXME works for View2D only

View File

@@ -48,6 +48,8 @@ ol.control.ZoomToExtent = function(opt_options) {
this.registerDisposable(buttonHandler); this.registerDisposable(buttonHandler);
goog.events.listen(buttonHandler, ol.pointer.EventType.POINTERUP, goog.events.listen(buttonHandler, ol.pointer.EventType.POINTERUP,
this.handleZoomToExtent_, false, this); this.handleZoomToExtent_, false, this);
goog.events.listen(button, goog.events.EventType.CLICK,
this.handleZoomToExtent_, false, this);
goog.events.listen(button, [ goog.events.listen(button, [
goog.events.EventType.MOUSEOUT, goog.events.EventType.MOUSEOUT,
@@ -73,7 +75,11 @@ goog.inherits(ol.control.ZoomToExtent, ol.control.Control);
* @private * @private
*/ */
ol.control.ZoomToExtent.prototype.handleZoomToExtent_ = function(pointerEvent) { ol.control.ZoomToExtent.prototype.handleZoomToExtent_ = function(pointerEvent) {
pointerEvent.browserEvent.preventDefault(); if (goog.isDef(pointerEvent.browserEvent)) {
pointerEvent.browserEvent.preventDefault();
} else if (pointerEvent.screenX !== 0 && pointerEvent.screenY !== 0) {
return;
}
// prevent #zoomExtent anchor from getting appended to the url // prevent #zoomExtent anchor from getting appended to the url
var map = this.getMap(); var map = this.getMap();
var view = map.getView(); var view = map.getView();