diff --git a/src/ol/control/zoomslider.js b/src/ol/control/zoomslider.js index b29ed71cba..90746513e4 100644 --- a/src/ol/control/zoomslider.js +++ b/src/ol/control/zoomslider.js @@ -55,12 +55,6 @@ ol.control.ZoomSlider = function(opt_options) { */ this.dragging_; - /** - * @type {!Array.} - * @private - */ - this.dragListenerKeys_ = []; - /** * @type {number} * @private @@ -255,25 +249,11 @@ ol.control.ZoomSlider.prototype.handleContainerClick_ = function(event) { * @private */ ol.control.ZoomSlider.prototype.handleDraggerStart_ = function(event) { - if (!this.dragging_ && - event.originalEvent.target === this.element.firstElementChild) { + if (!this.dragging_ && event.originalEvent.target === this.element.firstElementChild) { this.getMap().getView().setHint(ol.ViewHint.INTERACTING, 1); this.previousX_ = event.clientX; this.previousY_ = event.clientY; this.dragging_ = true; - - if (this.dragListenerKeys_.length === 0) { - var drag = this.handleDraggerDrag_; - var end = this.handleDraggerEnd_; - this.dragListenerKeys_.push( - ol.events.listen(document, ol.events.EventType.MOUSEMOVE, drag, this), - ol.events.listen(document, ol.events.EventType.TOUCHMOVE, drag, this), - ol.events.listen(document, ol.pointer.EventType.POINTERMOVE, drag, this), - ol.events.listen(document, ol.events.EventType.MOUSEUP, end, this), - ol.events.listen(document, ol.events.EventType.TOUCHEND, end, this), - ol.events.listen(document, ol.pointer.EventType.POINTERUP, end, this) - ); - } } }; @@ -318,8 +298,6 @@ ol.control.ZoomSlider.prototype.handleDraggerEnd_ = function(event) { this.dragging_ = false; this.previousX_ = undefined; this.previousY_ = undefined; - this.dragListenerKeys_.forEach(ol.events.unlistenByKey); - this.dragListenerKeys_.length = 0; } }; diff --git a/test/spec/ol/control/zoomslider.test.js b/test/spec/ol/control/zoomslider.test.js index 613f1ec976..de6e090f06 100644 --- a/test/spec/ol/control/zoomslider.test.js +++ b/test/spec/ol/control/zoomslider.test.js @@ -122,7 +122,6 @@ describe('ol.control.ZoomSlider', function() { dragger.dispatchEvent(event); expect(control.currentResolution_).to.be(16); expect(control.dragging_).to.be(true); - expect(control.dragListenerKeys_.length).to.be(6); event.type = 'pointermove'; event.clientX = 6 * control.widthLimit_ / 8; event.clientY = 0; @@ -135,7 +134,6 @@ describe('ol.control.ZoomSlider', function() { event.type = 'pointerup'; dragger.dispatchEvent(event); expect(control.currentResolution_).to.be(1); - expect(control.dragListenerKeys_.length).to.be(0); expect(control.dragging_).to.be(false); }); it('[vertical] handles a drag sequence', function() { @@ -156,7 +154,6 @@ describe('ol.control.ZoomSlider', function() { dragger.dispatchEvent(event); expect(control.currentResolution_).to.be(0.0625); expect(control.dragging_).to.be(true); - expect(control.dragListenerKeys_.length).to.be(6); event.type = 'pointermove'; event.clientX = 0; event.clientY = 2 * control.heightLimit_ / 8; @@ -169,7 +166,6 @@ describe('ol.control.ZoomSlider', function() { event.type = 'pointerup'; dragger.dispatchEvent(event); expect(control.currentResolution_).to.be(1); - expect(control.dragListenerKeys_.length).to.be(0); expect(control.dragging_).to.be(false); }); });