From 6ffda39b140da5ecb278228711faf2b81cbc18b8 Mon Sep 17 00:00:00 2001 From: ahocevar Date: Tue, 17 Jul 2018 14:29:27 +0200 Subject: [PATCH] Use extends and super for control/OverviewMap --- src/ol/control/OverviewMap.js | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js index 9849dcb538..5095040040 100644 --- a/src/ol/control/OverviewMap.js +++ b/src/ol/control/OverviewMap.js @@ -1,7 +1,6 @@ /** * @module ol/control/OverviewMap */ -import {inherits} from '../util.js'; import Collection from '../Collection.js'; import Map from '../Map.js'; import MapEventType from '../MapEventType.js'; @@ -62,15 +61,20 @@ const MIN_RATIO = 0.1; * Create a new control with a map acting as an overview map for an other * defined map. * @constructor - * @extends {module:ol/control/Control} * @param {module:ol/control/OverviewMap~Options=} opt_options OverviewMap options. * @api */ -class OverviewMap { +class OverviewMap extends Control { constructor(opt_options) { const options = opt_options ? opt_options : {}; + super({ + element: document.createElement('div'), + render: options.render || render, + target: options.target + }); + /** * @type {boolean} * @private @@ -175,17 +179,11 @@ class OverviewMap { const cssClasses = className + ' ' + CLASS_UNSELECTABLE + ' ' + CLASS_CONTROL + (this.collapsed_ && this.collapsible_ ? ' ' + CLASS_COLLAPSED : '') + (this.collapsible_ ? '' : ' ol-uncollapsible'); - const element = document.createElement('div'); + const element = this.element; element.className = cssClasses; element.appendChild(this.ovmapDiv_); element.appendChild(button); - Control.call(this, { - element: element, - render: options.render || render, - target: options.target - }); - /* Interactive map */ const scope = this; @@ -241,7 +239,7 @@ class OverviewMap { } this.ovmap_.setTarget(null); } - Control.prototype.setMap.call(this, map); + super.setMap(map); if (map) { this.ovmap_.setTarget(this.ovmapDiv_); @@ -565,8 +563,6 @@ class OverviewMap { } } -inherits(OverviewMap, Control); - /** * Update the overview map element.