diff --git a/src/ol/control.js b/src/ol/control.js index b770e3a9af..401862a606 100644 --- a/src/ol/control.js +++ b/src/ol/control.js @@ -4,7 +4,7 @@ import _ol_Collection_ from './Collection.js'; import Attribution from './control/Attribution.js'; import Rotate from './control/Rotate.js'; -import _ol_control_Zoom_ from './control/Zoom.js'; +import Zoom from './control/Zoom.js'; var _ol_control_ = {}; @@ -28,7 +28,7 @@ _ol_control_.defaults = function(opt_options) { var zoomControl = options.zoom !== undefined ? options.zoom : true; if (zoomControl) { - controls.push(new _ol_control_Zoom_(options.zoomOptions)); + controls.push(new Zoom(options.zoomOptions)); } var rotateControl = options.rotate !== undefined ? options.rotate : true; diff --git a/src/ol/control/Zoom.js b/src/ol/control/Zoom.js index 24a78f76c6..2b266e439c 100644 --- a/src/ol/control/Zoom.js +++ b/src/ol/control/Zoom.js @@ -19,7 +19,7 @@ import {easeOut} from '../easing.js'; * @param {olx.control.ZoomOptions=} opt_options Zoom options. * @api */ -var _ol_control_Zoom_ = function(opt_options) { +var Zoom = function(opt_options) { var options = opt_options ? opt_options : {}; @@ -44,7 +44,7 @@ var _ol_control_Zoom_ = function(opt_options) { ); _ol_events_.listen(inElement, _ol_events_EventType_.CLICK, - _ol_control_Zoom_.prototype.handleClick_.bind(this, delta)); + Zoom.prototype.handleClick_.bind(this, delta)); var outElement = document.createElement('button'); outElement.className = className + '-out'; @@ -55,7 +55,7 @@ var _ol_control_Zoom_ = function(opt_options) { ); _ol_events_.listen(outElement, _ol_events_EventType_.CLICK, - _ol_control_Zoom_.prototype.handleClick_.bind(this, -delta)); + Zoom.prototype.handleClick_.bind(this, -delta)); var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' + _ol_css_.CLASS_CONTROL; @@ -77,7 +77,7 @@ var _ol_control_Zoom_ = function(opt_options) { }; -inherits(_ol_control_Zoom_, Control); +inherits(Zoom, Control); /** @@ -85,7 +85,7 @@ inherits(_ol_control_Zoom_, Control); * @param {Event} event The event to handle * @private */ -_ol_control_Zoom_.prototype.handleClick_ = function(delta, event) { +Zoom.prototype.handleClick_ = function(delta, event) { event.preventDefault(); this.zoomByDelta_(delta); }; @@ -95,7 +95,7 @@ _ol_control_Zoom_.prototype.handleClick_ = function(delta, event) { * @param {number} delta Zoom delta. * @private */ -_ol_control_Zoom_.prototype.zoomByDelta_ = function(delta) { +Zoom.prototype.zoomByDelta_ = function(delta) { var map = this.getMap(); var view = map.getView(); if (!view) { @@ -120,4 +120,4 @@ _ol_control_Zoom_.prototype.zoomByDelta_ = function(delta) { } } }; -export default _ol_control_Zoom_; +export default Zoom; diff --git a/test/spec/ol/control/zoom.test.js b/test/spec/ol/control/zoom.test.js index e38365b7bf..98b69fa2c5 100644 --- a/test/spec/ol/control/zoom.test.js +++ b/test/spec/ol/control/zoom.test.js @@ -1,12 +1,12 @@ -import _ol_control_Zoom_ from '../../../../src/ol/control/Zoom.js'; +import Zoom from '../../../../src/ol/control/Zoom.js'; describe('ol.control.Zoom', function() { describe('constructor', function() { it('can be constructed without arguments', function() { - var instance = new _ol_control_Zoom_(); - expect(instance).to.be.an(_ol_control_Zoom_); + var instance = new Zoom(); + expect(instance).to.be.an(Zoom); }); });