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

Allow ol.control.ScaleLine units option to be a string

Browse Source
This commit is contained in:
Tom Payne
2014-02-06 19:34:15 +01:00
parent 2cef7b98fd
commit 84fd853dc1
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/objectliterals.jsdoc
+2 -2
View File
@@ -236,8 +236,8 @@
* @property {string|undefined} className CSS Class name. Default is `ol-scale-line`. * @property {string|undefined} className CSS Class name. Default is `ol-scale-line`.
* @property {number|undefined} minWidth Minimum width in pixels. Default is `64`. * @property {number|undefined} minWidth Minimum width in pixels. Default is `64`.
* @property {Element|undefined} target Target. * @property {Element|undefined} target Target.
* @property {ol.control.ScaleLineUnits|undefined} units Units. * @property {ol.control.ScaleLineUnits|string|undefined} units Units.
* Default is `ol.control.ScaleLineUnits.METRIC`. * Default is `metric`.
* @todo stability experimental * @todo stability experimental
*/ */
src/ol/control/scalelinecontrol.js
+2 -1
View File
@@ -122,7 +122,8 @@ ol.control.ScaleLine = function(opt_options) {
this, ol.Object.getChangeEventType(ol.control.ScaleLineProperty.UNITS), this, ol.Object.getChangeEventType(ol.control.ScaleLineProperty.UNITS),
this.handleUnitsChanged_, false, this); this.handleUnitsChanged_, false, this);
this.setUnits(options.units || ol.control.ScaleLineUnits.METRIC); this.setUnits(/** @type {ol.control.ScaleLineUnits} */ (options.units) ||
ol.control.ScaleLineUnits.METRIC);
}; };
goog.inherits(ol.control.ScaleLine, ol.control.Control); goog.inherits(ol.control.ScaleLine, ol.control.Control);