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

Rename _ol_interaction_DoubleClickZoom_ to DoubleClickZoom

Browse Source
This commit is contained in:
Marc Jansen
2017-12-15 10:21:57 +01:00
committed by Tim Schaub
parent 4a1d50730b
commit 66c5f9b63d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/interaction.js
View File

@@ -3,7 +3,7 @@
*/ */
import _ol_Collection_ from './Collection.js'; import _ol_Collection_ from './Collection.js';
import _ol_Kinetic_ from './Kinetic.js'; import _ol_Kinetic_ from './Kinetic.js';
import _ol_interaction_DoubleClickZoom_ from './interaction/DoubleClickZoom.js'; import DoubleClickZoom from './interaction/DoubleClickZoom.js';
import _ol_interaction_DragPan_ from './interaction/DragPan.js'; import _ol_interaction_DragPan_ from './interaction/DragPan.js';
import _ol_interaction_DragRotate_ from './interaction/DragRotate.js'; import _ol_interaction_DragRotate_ from './interaction/DragRotate.js';
import _ol_interaction_DragZoom_ from './interaction/DragZoom.js'; import _ol_interaction_DragZoom_ from './interaction/DragZoom.js';
@@ -55,7 +55,7 @@ _ol_interaction_.defaults = function(opt_options) {
var doubleClickZoom = options.doubleClickZoom !== undefined ? var doubleClickZoom = options.doubleClickZoom !== undefined ?
options.doubleClickZoom : true; options.doubleClickZoom : true;
if (doubleClickZoom) { if (doubleClickZoom) {
interactions.push(new _ol_interaction_DoubleClickZoom_({ interactions.push(new DoubleClickZoom({
delta: options.zoomDelta, delta: options.zoomDelta,
duration: options.zoomDuration duration: options.zoomDuration
})); }));

10
src/ol/interaction/DoubleClickZoom.js
View File

@@ -14,7 +14,7 @@ import Interaction from '../interaction/Interaction.js';
* @param {olx.interaction.DoubleClickZoomOptions=} opt_options Options. * @param {olx.interaction.DoubleClickZoomOptions=} opt_options Options.
* @api * @api
*/ */
var _ol_interaction_DoubleClickZoom_ = function(opt_options) { var DoubleClickZoom = function(opt_options) {
var options = opt_options ? opt_options : {}; var options = opt_options ? opt_options : {};
@@ -25,7 +25,7 @@ var _ol_interaction_DoubleClickZoom_ = function(opt_options) {
this.delta_ = options.delta ? options.delta : 1; this.delta_ = options.delta ? options.delta : 1;
Interaction.call(this, { Interaction.call(this, {
handleEvent: _ol_interaction_DoubleClickZoom_.handleEvent handleEvent: DoubleClickZoom.handleEvent
}); });
/** /**
@@ -36,7 +36,7 @@ var _ol_interaction_DoubleClickZoom_ = function(opt_options) {
}; };
inherits(_ol_interaction_DoubleClickZoom_, Interaction); inherits(DoubleClickZoom, Interaction);
/** /**
@@ -47,7 +47,7 @@ inherits(_ol_interaction_DoubleClickZoom_, Interaction);
* @this {ol.interaction.DoubleClickZoom} * @this {ol.interaction.DoubleClickZoom}
* @api * @api
*/ */
_ol_interaction_DoubleClickZoom_.handleEvent = function(mapBrowserEvent) { DoubleClickZoom.handleEvent = function(mapBrowserEvent) {
var stopEvent = false; var stopEvent = false;
var browserEvent = mapBrowserEvent.originalEvent; var browserEvent = mapBrowserEvent.originalEvent;
if (mapBrowserEvent.type == MapBrowserEventType.DBLCLICK) { if (mapBrowserEvent.type == MapBrowserEventType.DBLCLICK) {
@@ -62,4 +62,4 @@ _ol_interaction_DoubleClickZoom_.handleEvent = function(mapBrowserEvent) {
} }
return !stopEvent; return !stopEvent;
}; };
export default _ol_interaction_DoubleClickZoom_; export default DoubleClickZoom;

6
test/spec/ol/map.test.js
View File

@@ -6,7 +6,7 @@ import _ol_View_ from '../../../src/ol/View.js';
import Point from '../../../src/ol/geom/Point.js'; import Point from '../../../src/ol/geom/Point.js';
import _ol_has_ from '../../../src/ol/has.js'; import _ol_has_ from '../../../src/ol/has.js';
import _ol_interaction_ from '../../../src/ol/interaction.js'; import _ol_interaction_ from '../../../src/ol/interaction.js';
import _ol_interaction_DoubleClickZoom_ from '../../../src/ol/interaction/DoubleClickZoom.js'; import DoubleClickZoom from '../../../src/ol/interaction/DoubleClickZoom.js';
import Interaction from '../../../src/ol/interaction/Interaction.js'; import Interaction from '../../../src/ol/interaction/Interaction.js';
import _ol_interaction_MouseWheelZoom_ from '../../../src/ol/interaction/MouseWheelZoom.js'; import _ol_interaction_MouseWheelZoom_ from '../../../src/ol/interaction/MouseWheelZoom.js';
import _ol_interaction_PinchZoom_ from '../../../src/ol/interaction/PinchZoom.js'; import _ol_interaction_PinchZoom_ from '../../../src/ol/interaction/PinchZoom.js';
@@ -524,7 +524,7 @@ describe('ol.Map', function() {
it('create double click interaction with default delta', function() { it('create double click interaction with default delta', function() {
var interactions = _ol_interaction_.defaults(options); var interactions = _ol_interaction_.defaults(options);
expect(interactions.getLength()).to.eql(1); expect(interactions.getLength()).to.eql(1);
expect(interactions.item(0)).to.be.a(_ol_interaction_DoubleClickZoom_); expect(interactions.item(0)).to.be.a(DoubleClickZoom);
expect(interactions.item(0).delta_).to.eql(1); expect(interactions.item(0).delta_).to.eql(1);
}); });
}); });
@@ -534,7 +534,7 @@ describe('ol.Map', function() {
options.zoomDelta = 7; options.zoomDelta = 7;
var interactions = _ol_interaction_.defaults(options); var interactions = _ol_interaction_.defaults(options);
expect(interactions.getLength()).to.eql(1); expect(interactions.getLength()).to.eql(1);
expect(interactions.item(0)).to.be.a(_ol_interaction_DoubleClickZoom_); expect(interactions.item(0)).to.be.a(DoubleClickZoom);
expect(interactions.item(0).delta_).to.eql(7); expect(interactions.item(0).delta_).to.eql(7);
}); });
}); });