From 6b859f17ae9fb3966784abfae084f72519c40f6c Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Thu, 14 Dec 2017 13:08:48 -0700 Subject: [PATCH] Rename _ol_control_ZoomToExtent_ to ZoomToExtent --- examples/navigation-controls.js | 4 ++-- src/ol/control/ZoomToExtent.js | 10 +++++----- test/spec/ol/control/zoomtoextent.test.js | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js index 72c7f1b83b..f407bed8cc 100644 --- a/examples/navigation-controls.js +++ b/examples/navigation-controls.js @@ -1,7 +1,7 @@ import _ol_Map_ from '../src/ol/Map.js'; import _ol_View_ from '../src/ol/View.js'; import _ol_control_ from '../src/ol/control.js'; -import _ol_control_ZoomToExtent_ from '../src/ol/control/ZoomToExtent.js'; +import ZoomToExtent from '../src/ol/control/ZoomToExtent.js'; import _ol_layer_Tile_ from '../src/ol/layer/Tile.js'; import _ol_source_OSM_ from '../src/ol/source/OSM.js'; @@ -12,7 +12,7 @@ var map = new _ol_Map_({ collapsible: false } }).extend([ - new _ol_control_ZoomToExtent_({ + new ZoomToExtent({ extent: [ 813079.7791264898, 5929220.284081122, 848966.9639063801, 5936863.986909639 diff --git a/src/ol/control/ZoomToExtent.js b/src/ol/control/ZoomToExtent.js index 336899fc75..fc4d194a41 100644 --- a/src/ol/control/ZoomToExtent.js +++ b/src/ol/control/ZoomToExtent.js @@ -17,7 +17,7 @@ import _ol_css_ from '../css.js'; * @param {olx.control.ZoomToExtentOptions=} opt_options Options. * @api */ -var _ol_control_ZoomToExtent_ = function(opt_options) { +var ZoomToExtent = function(opt_options) { var options = opt_options ? opt_options : {}; /** @@ -54,14 +54,14 @@ var _ol_control_ZoomToExtent_ = function(opt_options) { }); }; -inherits(_ol_control_ZoomToExtent_, Control); +inherits(ZoomToExtent, Control); /** * @param {Event} event The event to handle * @private */ -_ol_control_ZoomToExtent_.prototype.handleClick_ = function(event) { +ZoomToExtent.prototype.handleClick_ = function(event) { event.preventDefault(); this.handleZoomToExtent(); }; @@ -70,10 +70,10 @@ _ol_control_ZoomToExtent_.prototype.handleClick_ = function(event) { /** * @protected */ -_ol_control_ZoomToExtent_.prototype.handleZoomToExtent = function() { +ZoomToExtent.prototype.handleZoomToExtent = function() { var map = this.getMap(); var view = map.getView(); var extent = !this.extent ? view.getProjection().getExtent() : this.extent; view.fit(extent); }; -export default _ol_control_ZoomToExtent_; +export default ZoomToExtent; diff --git a/test/spec/ol/control/zoomtoextent.test.js b/test/spec/ol/control/zoomtoextent.test.js index 868cb83280..f346aa03eb 100644 --- a/test/spec/ol/control/zoomtoextent.test.js +++ b/test/spec/ol/control/zoomtoextent.test.js @@ -1,12 +1,12 @@ -import _ol_control_ZoomToExtent_ from '../../../../src/ol/control/ZoomToExtent.js'; +import ZoomToExtent from '../../../../src/ol/control/ZoomToExtent.js'; describe('ol.control.ZoomToExtent', function() { describe('constructor', function() { it('can be constructed without arguments', function() { - var instance = new _ol_control_ZoomToExtent_(); - expect(instance).to.be.an(_ol_control_ZoomToExtent_); + var instance = new ZoomToExtent(); + expect(instance).to.be.an(ZoomToExtent); }); });