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

Remove goog.events.KeyHandler

Browse Source
This commit is contained in:
Andreas Hocevar
2016-01-25 10:59:10 +01:00
parent 0f216659f9
commit 1a6daa297e
4 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ol/map.js
View File

@@ -12,11 +12,6 @@ goog.require('goog.debug.Console');
goog.require('goog.dom');
goog.require('goog.dom.ViewportSizeMonitor');
goog.require('goog.dom.classlist');
goog.require('ol.events');
goog.require('ol.events.Event');
goog.require('ol.events.EventType');
goog.require('goog.events.KeyHandler');
goog.require('goog.events.KeyHandler.EventType');
goog.require('goog.events.MouseWheelHandler');
goog.require('goog.events.MouseWheelHandler.EventType');
goog.require('goog.functions');
@@ -312,12 +307,9 @@ ol.Map = function(options) {
/**
* @private
* @type {goog.events.KeyHandler}
* @type {ol.events.Key|undefined}
*/
this.keyHandler_ = new goog.events.KeyHandler();
ol.events.listen(this.keyHandler_, goog.events.KeyHandler.EventType.KEY,
this.handleBrowserEvent, false, this);
this.registerDisposable(this.keyHandler_);
this.keyHandlerKey_;
var mouseWheelHandler = new goog.events.MouseWheelHandler(this.viewport_);
ol.events.listen(mouseWheelHandler,
@@ -1061,7 +1053,9 @@ ol.Map.prototype.handleTargetChanged_ = function() {
var targetElement = this.getTargetElement();
this.keyHandler_.detach();
if (this.keyHandlerKey_) {
ol.events.unlistenByKey(this.keyHandlerKey_);
}
if (!targetElement) {
goog.dom.removeNode(this.viewport_);
@@ -1074,7 +1068,9 @@ ol.Map.prototype.handleTargetChanged_ = function() {
var keyboardEventTarget = !this.keyboardEventTarget_ ?
targetElement : this.keyboardEventTarget_;
this.keyHandler_.attach(keyboardEventTarget);
this.keyHandlerKey_ = ol.events.listen(keyboardEventTarget,
[ol.events.EventType.KEYDOWN, ol.events.EventType.KEYPRESS],
this.handleBrowserEvent, false, this);
if (!this.viewportResizeListenerKey_) {
this.viewportResizeListenerKey_ = ol.events.listen(