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

Remove goog.events.MouseWheelEvent and goog.events.MouseWheelHandler

Browse Source
This commit is contained in:
Andreas Hocevar
2016-01-25 18:35:43 +01:00
parent 1a6daa297e
commit 6ac3f30c8f
5 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ol/map.js
View File

@@ -12,8 +12,6 @@ goog.require('goog.debug.Console');
goog.require('goog.dom');
goog.require('goog.dom.ViewportSizeMonitor');
goog.require('goog.dom.classlist');
goog.require('goog.events.MouseWheelHandler');
goog.require('goog.events.MouseWheelHandler.EventType');
goog.require('goog.functions');
goog.require('goog.log');
goog.require('goog.log.Level');
@@ -311,11 +309,10 @@ ol.Map = function(options) {
*/
this.keyHandlerKey_;
var mouseWheelHandler = new goog.events.MouseWheelHandler(this.viewport_);
ol.events.listen(mouseWheelHandler,
goog.events.MouseWheelHandler.EventType.MOUSEWHEEL,
ol.events.listen(this.viewport_, ol.events.EventType.WHEEL,
this.handleBrowserEvent, false, this);
ol.events.listen(this.viewport_, ol.events.EventType.MOUSEWHEEL,
this.handleBrowserEvent, false, this);
this.registerDisposable(mouseWheelHandler);
/**
* @type {ol.Collection.<ol.control.Control>}
@@ -577,6 +574,14 @@ ol.Map.prototype.removePreRenderFunction = function(preRenderFunction) {
* @inheritDoc
*/
ol.Map.prototype.disposeInternal = function() {
ol.events.unlisten(this.viewport_, ol.events.EventType.WHEEL,
this.handleBrowserEvent, false, this);
ol.events.unlisten(this.viewport_, ol.events.EventType.MOUSEWHEEL,
this.handleBrowserEvent, false, this);
if (this.handleResize_ !== undefined) {
goog.global.removeEventListener(ol.events.EventType.RESIZE,
this.handleResize_, false, this);
}
goog.dom.removeNode(this.viewport_);
goog.base(this, 'disposeInternal');
};