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

Private enum for mousewheel mode

Browse Source
This commit is contained in:
Tim Schaub
2016-12-27 13:32:24 -07:00
parent 455be84cbd
commit 69d345171e
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/interaction/mousewheelzoom.js
+6 -5
View File
@@ -70,7 +70,7 @@ ol.interaction.MouseWheelZoom = function(opt_options) {
/** /**
* @private * @private
* @type {ol.interaction.MouseWheelZoom.Mode|undefined} * @type {ol.interaction.MouseWheelZoom.Mode_|undefined}
*/ */
this.mode_ = undefined; this.mode_ = undefined;
@@ -158,11 +158,11 @@ ol.interaction.MouseWheelZoom.handleEvent = function(mapBrowserEvent) {
if (!this.mode_ || now - this.startTime_ > this.trackpadEventGap_) { if (!this.mode_ || now - this.startTime_ > this.trackpadEventGap_) {
this.mode_ = Math.abs(delta) < 4 ? this.mode_ = Math.abs(delta) < 4 ?
ol.interaction.MouseWheelZoom.Mode.TRACKPAD : ol.interaction.MouseWheelZoom.Mode_.TRACKPAD :
ol.interaction.MouseWheelZoom.Mode.WHEEL; ol.interaction.MouseWheelZoom.Mode_.WHEEL;
} }
if (this.mode_ === ol.interaction.MouseWheelZoom.Mode.TRACKPAD) { if (this.mode_ === ol.interaction.MouseWheelZoom.Mode_.TRACKPAD) {
var view = map.getView(); var view = map.getView();
if (this.trackpadTimeoutId_) { if (this.trackpadTimeoutId_) {
clearTimeout(this.trackpadTimeoutId_); clearTimeout(this.trackpadTimeoutId_);
@@ -263,8 +263,9 @@ ol.interaction.MouseWheelZoom.prototype.setMouseAnchor = function(useAnchor) {
/** /**
* @enum {string} * @enum {string}
* @private
*/ */
ol.interaction.MouseWheelZoom.Mode = { ol.interaction.MouseWheelZoom.Mode_ = {
TRACKPAD: 'trackpad', TRACKPAD: 'trackpad',
WHEEL: 'wheel' WHEEL: 'wheel'
}; };
test/spec/ol/interaction/mousewheelzoom.test.js
+2 -2
View File
@@ -69,7 +69,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
var origHasFirefox = ol.has.FIREFOX; var origHasFirefox = ol.has.FIREFOX;
ol.has.FIREFOX = true; ol.has.FIREFOX = true;
map.once('postrender', function() { map.once('postrender', function() {
expect(interaction.mode_).to.be(ol.interaction.MouseWheelZoom.Mode.TRACKPAD); expect(interaction.mode_).to.be(ol.interaction.MouseWheelZoom.Mode_.TRACKPAD);
ol.has.FIREFOX = origHasFirefox; ol.has.FIREFOX = origHasFirefox;
done(); done();
}); });
@@ -88,7 +88,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
var origHasFirefox = ol.has.FIREFOX; var origHasFirefox = ol.has.FIREFOX;
ol.has.FIREFOX = false; ol.has.FIREFOX = false;
map.once('postrender', function() { map.once('postrender', function() {
expect(interaction.mode_).to.be(ol.interaction.MouseWheelZoom.Mode.TRACKPAD); expect(interaction.mode_).to.be(ol.interaction.MouseWheelZoom.Mode_.TRACKPAD);
ol.has.FIREFOX = origHasFirefox; ol.has.FIREFOX = origHasFirefox;
done(); done();
}); });