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

Don't listen twice to move and end events in ol.control.ZoomSlider

Browse Source
This commit is contained in:
Frederic Junod
2017-01-31 12:37:21 +01:00
parent ebce967ebd
commit 7b687be9e0
2 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ol/control/zoomslider.js
View File

@@ -55,12 +55,6 @@ ol.control.ZoomSlider = function(opt_options) {
*/ */
this.dragging_; this.dragging_;
/**
* @type {!Array.<ol.EventsKey>}
* @private
*/
this.dragListenerKeys_ = [];
/** /**
* @type {number} * @type {number}
* @private * @private
@@ -255,25 +249,11 @@ ol.control.ZoomSlider.prototype.handleContainerClick_ = function(event) {
* @private * @private
*/ */
ol.control.ZoomSlider.prototype.handleDraggerStart_ = function(event) { ol.control.ZoomSlider.prototype.handleDraggerStart_ = function(event) {
if (!this.dragging_ && if (!this.dragging_ && event.originalEvent.target === this.element.firstElementChild) {
event.originalEvent.target === this.element.firstElementChild) {
this.getMap().getView().setHint(ol.ViewHint.INTERACTING, 1); this.getMap().getView().setHint(ol.ViewHint.INTERACTING, 1);
this.previousX_ = event.clientX; this.previousX_ = event.clientX;
this.previousY_ = event.clientY; this.previousY_ = event.clientY;
this.dragging_ = true; 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.dragging_ = false;
this.previousX_ = undefined; this.previousX_ = undefined;
this.previousY_ = undefined; this.previousY_ = undefined;
this.dragListenerKeys_.forEach(ol.events.unlistenByKey);
this.dragListenerKeys_.length = 0;
} }
}; };

4
test/spec/ol/control/zoomslider.test.js
View File

@@ -122,7 +122,6 @@ describe('ol.control.ZoomSlider', function() {
dragger.dispatchEvent(event); dragger.dispatchEvent(event);
expect(control.currentResolution_).to.be(16); expect(control.currentResolution_).to.be(16);
expect(control.dragging_).to.be(true); expect(control.dragging_).to.be(true);
expect(control.dragListenerKeys_.length).to.be(6);
event.type = 'pointermove'; event.type = 'pointermove';
event.clientX = 6 * control.widthLimit_ / 8; event.clientX = 6 * control.widthLimit_ / 8;
event.clientY = 0; event.clientY = 0;
@@ -135,7 +134,6 @@ describe('ol.control.ZoomSlider', function() {
event.type = 'pointerup'; event.type = 'pointerup';
dragger.dispatchEvent(event); dragger.dispatchEvent(event);
expect(control.currentResolution_).to.be(1); expect(control.currentResolution_).to.be(1);
expect(control.dragListenerKeys_.length).to.be(0);
expect(control.dragging_).to.be(false); expect(control.dragging_).to.be(false);
}); });
it('[vertical] handles a drag sequence', function() { it('[vertical] handles a drag sequence', function() {
@@ -156,7 +154,6 @@ describe('ol.control.ZoomSlider', function() {
dragger.dispatchEvent(event); dragger.dispatchEvent(event);
expect(control.currentResolution_).to.be(0.0625); expect(control.currentResolution_).to.be(0.0625);
expect(control.dragging_).to.be(true); expect(control.dragging_).to.be(true);
expect(control.dragListenerKeys_.length).to.be(6);
event.type = 'pointermove'; event.type = 'pointermove';
event.clientX = 0; event.clientX = 0;
event.clientY = 2 * control.heightLimit_ / 8; event.clientY = 2 * control.heightLimit_ / 8;
@@ -169,7 +166,6 @@ describe('ol.control.ZoomSlider', function() {
event.type = 'pointerup'; event.type = 'pointerup';
dragger.dispatchEvent(event); dragger.dispatchEvent(event);
expect(control.currentResolution_).to.be(1); expect(control.currentResolution_).to.be(1);
expect(control.dragListenerKeys_.length).to.be(0);
expect(control.dragging_).to.be(false); expect(control.dragging_).to.be(false);
}); });
}); });