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

Rename _ol_interaction_PinchZoom_ to PinchZoom

Browse Source
This commit is contained in:
Frederic Junod
2018-01-11 13:49:48 +01:00
parent 356cea1611
commit 120c42f7a4
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/interaction.js
View File

@@ -11,7 +11,7 @@ import _ol_interaction_KeyboardPan_ from './interaction/KeyboardPan.js';
import _ol_interaction_KeyboardZoom_ from './interaction/KeyboardZoom.js';
import MouseWheelZoom from './interaction/MouseWheelZoom.js';
import _ol_interaction_PinchRotate_ from './interaction/PinchRotate.js';
import _ol_interaction_PinchZoom_ from './interaction/PinchZoom.js';
import PinchZoom from './interaction/PinchZoom.js';
/**
@@ -75,7 +75,7 @@ export function defaults(opt_options) {
var pinchZoom = options.pinchZoom !== undefined ? options.pinchZoom : true;
if (pinchZoom) {
interactions.push(new _ol_interaction_PinchZoom_({
interactions.push(new PinchZoom({
constrainResolution: options.constrainResolution,
duration: options.zoomDuration
}));

20
src/ol/interaction/PinchZoom.js
View File

@@ -17,12 +17,12 @@ import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
* @param {olx.interaction.PinchZoomOptions=} opt_options Options.
* @api
*/
var _ol_interaction_PinchZoom_ = function(opt_options) {
var PinchZoom = function(opt_options) {
_ol_interaction_Pointer_.call(this, {
handleDownEvent: _ol_interaction_PinchZoom_.handleDownEvent_,
handleDragEvent: _ol_interaction_PinchZoom_.handleDragEvent_,
handleUpEvent: _ol_interaction_PinchZoom_.handleUpEvent_
handleDownEvent: PinchZoom.handleDownEvent_,
handleDragEvent: PinchZoom.handleDragEvent_,
handleUpEvent: PinchZoom.handleUpEvent_
});
var options = opt_options ? opt_options : {};
@@ -59,7 +59,7 @@ var _ol_interaction_PinchZoom_ = function(opt_options) {
};
inherits(_ol_interaction_PinchZoom_, _ol_interaction_Pointer_);
inherits(PinchZoom, _ol_interaction_Pointer_);
/**
@@ -67,7 +67,7 @@ inherits(_ol_interaction_PinchZoom_, _ol_interaction_Pointer_);
* @this {ol.interaction.PinchZoom}
* @private
*/
_ol_interaction_PinchZoom_.handleDragEvent_ = function(mapBrowserEvent) {
PinchZoom.handleDragEvent_ = function(mapBrowserEvent) {
var scaleDelta = 1.0;
var touch0 = this.targetPointers[0];
@@ -121,7 +121,7 @@ _ol_interaction_PinchZoom_.handleDragEvent_ = function(mapBrowserEvent) {
* @this {ol.interaction.PinchZoom}
* @private
*/
_ol_interaction_PinchZoom_.handleUpEvent_ = function(mapBrowserEvent) {
PinchZoom.handleUpEvent_ = function(mapBrowserEvent) {
if (this.targetPointers.length < 2) {
var map = mapBrowserEvent.map;
var view = map.getView();
@@ -150,7 +150,7 @@ _ol_interaction_PinchZoom_.handleUpEvent_ = function(mapBrowserEvent) {
* @this {ol.interaction.PinchZoom}
* @private
*/
_ol_interaction_PinchZoom_.handleDownEvent_ = function(mapBrowserEvent) {
PinchZoom.handleDownEvent_ = function(mapBrowserEvent) {
if (this.targetPointers.length >= 2) {
var map = mapBrowserEvent.map;
this.anchor_ = null;
@@ -169,5 +169,5 @@ _ol_interaction_PinchZoom_.handleDownEvent_ = function(mapBrowserEvent) {
/**
* @inheritDoc
*/
_ol_interaction_PinchZoom_.prototype.shouldStopEvent = FALSE;
export default _ol_interaction_PinchZoom_;
PinchZoom.prototype.shouldStopEvent = FALSE;
export default PinchZoom;