From e3f199fe3717ad8091f417097d52f239a0f18363 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sun, 18 Feb 2018 22:43:10 -0700 Subject: [PATCH] Export render from ol/control/ScaleLine --- src/ol/control/ScaleLine.js | 8 +++----- test/spec/ol/control/scaleline.test.js | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/ol/control/ScaleLine.js b/src/ol/control/ScaleLine.js index 404c431b57..00091a8eb0 100644 --- a/src/ol/control/ScaleLine.js +++ b/src/ol/control/ScaleLine.js @@ -91,11 +91,9 @@ const ScaleLine = function(opt_options) { */ this.renderedHTML_ = ''; - const render = options.render ? options.render : ScaleLine.render; - Control.call(this, { element: this.element_, - render: render, + render: options.render || render, target: options.target }); @@ -129,7 +127,7 @@ ScaleLine.prototype.getUnits = function() { * @this {ol.control.ScaleLine} * @api */ -ScaleLine.render = function(mapEvent) { +export function render(mapEvent) { const frameState = mapEvent.frameState; if (!frameState) { this.viewState_ = null; @@ -137,7 +135,7 @@ ScaleLine.render = function(mapEvent) { this.viewState_ = frameState.viewState; } this.updateElement_(); -}; +} /** diff --git a/test/spec/ol/control/scaleline.test.js b/test/spec/ol/control/scaleline.test.js index f8396f2eb9..5ae93b2f44 100644 --- a/test/spec/ol/control/scaleline.test.js +++ b/test/spec/ol/control/scaleline.test.js @@ -1,6 +1,6 @@ import Map from '../../../../src/ol/Map.js'; import View from '../../../../src/ol/View.js'; -import ScaleLine from '../../../../src/ol/control/ScaleLine.js'; +import ScaleLine, {render} from '../../../../src/ol/control/ScaleLine.js'; import {fromLonLat} from '../../../../src/ol/proj.js'; import Projection from '../../../../src/ol/proj/Projection.js'; @@ -67,12 +67,10 @@ describe('ol.control.ScaleLine', function() { describe('render', function() { it('defaults to `ol.control.ScaleLine.render`', function() { const ctrl = new ScaleLine(); - expect(ctrl.render).to.be(ScaleLine.render); + expect(ctrl.render).to.be(render); }); it('can be configured', function() { - const myRender = function() { - - }; + const myRender = function() {}; const ctrl = new ScaleLine({ render: myRender });