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

Reuse dragListenerKeys_ variable in ol.control.ZoomSlider

Browse Source
This commit is contained in:
Frederic Junod
2016-03-29 16:52:28 +02:00
parent 8ef230768b
commit 0bb3f1e228
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/control/zoomslidercontrol.js
+6 -6
View File
@@ -59,10 +59,10 @@ ol.control.ZoomSlider = function(opt_options) {
this.dragging_; this.dragging_;
/** /**
* @type {Array.<ol.events.Key>} * @type {!Array.<ol.events.Key>}
* @private * @private
*/ */
this.dragListenerKeys_; this.dragListenerKeys_ = [];
/** /**
* @type {number} * @type {number}
@@ -267,17 +267,17 @@ ol.control.ZoomSlider.prototype.handleDraggerStart_ = function(event) {
this.previousY_ = event.clientY; this.previousY_ = event.clientY;
this.dragging_ = true; this.dragging_ = true;
if (!this.dragListenerKeys_) { if (this.dragListenerKeys_.length === 0) {
var drag = this.handleDraggerDrag_; var drag = this.handleDraggerDrag_;
var end = this.handleDraggerEnd_; var end = this.handleDraggerEnd_;
this.dragListenerKeys_ = [ this.dragListenerKeys_.push(
ol.events.listen(document, ol.events.EventType.MOUSEMOVE, drag, this), 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.events.EventType.TOUCHMOVE, drag, this),
ol.events.listen(document, ol.pointer.EventType.POINTERMOVE, 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.MOUSEUP, end, this),
ol.events.listen(document, ol.events.EventType.TOUCHEND, end, this), ol.events.listen(document, ol.events.EventType.TOUCHEND, end, this),
ol.events.listen(document, ol.pointer.EventType.POINTERUP, end, this) ol.events.listen(document, ol.pointer.EventType.POINTERUP, end, this)
]; );
} }
} }
}; };
@@ -327,7 +327,7 @@ ol.control.ZoomSlider.prototype.handleDraggerEnd_ = function(event) {
this.previousX_ = undefined; this.previousX_ = undefined;
this.previousY_ = undefined; this.previousY_ = undefined;
this.dragListenerKeys_.forEach(ol.events.unlistenByKey); this.dragListenerKeys_.forEach(ol.events.unlistenByKey);
this.dragListenerKeys_ = null; this.dragListenerKeys_.length = 0;
} }
}; };
test/spec/ol/control/zoomslidercontrol.test.js
+4 -4
View File
@@ -119,7 +119,7 @@ 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_).to.be.ok(); expect(control.dragListenerKeys_.length).to.be(6);
event.type = ol.pointer.EventType.POINTERMOVE; event.type = ol.pointer.EventType.POINTERMOVE;
event.clientX = 6 * control.widthLimit_ / 8; event.clientX = 6 * control.widthLimit_ / 8;
event.clientY = 0; event.clientY = 0;
@@ -132,7 +132,7 @@ describe('ol.control.ZoomSlider', function() {
event.type = ol.pointer.EventType.POINTERUP; event.type = ol.pointer.EventType.POINTERUP;
dragger.dispatchEvent(event); dragger.dispatchEvent(event);
expect(control.currentResolution_).to.be(1); expect(control.currentResolution_).to.be(1);
expect(control.dragListenerKeys_).to.be(null); 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() {
@@ -153,7 +153,7 @@ 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_).to.be.ok(); expect(control.dragListenerKeys_.length).to.be(6);
event.type = ol.pointer.EventType.POINTERMOVE; event.type = ol.pointer.EventType.POINTERMOVE;
event.clientX = 0; event.clientX = 0;
event.clientY = 2 * control.heightLimit_ / 8; event.clientY = 2 * control.heightLimit_ / 8;
@@ -166,7 +166,7 @@ describe('ol.control.ZoomSlider', function() {
event.type = ol.pointer.EventType.POINTERUP; event.type = ol.pointer.EventType.POINTERUP;
dragger.dispatchEvent(event); dragger.dispatchEvent(event);
expect(control.currentResolution_).to.be(1); expect(control.currentResolution_).to.be(1);
expect(control.dragListenerKeys_).to.be(null); expect(control.dragListenerKeys_.length).to.be(0);
expect(control.dragging_).to.be(false); expect(control.dragging_).to.be(false);
}); });
}); });