Disallowed undefined 'saturation' value

This commit is contained in:
Frederic Junod
2015-01-27 14:31:11 +01:00
parent caa8428990
commit 60ea87fdfb
+4 -5
View File
@@ -148,7 +148,7 @@ ol.layer.Base.prototype.getLayerState = function() {
contrast: Math.max(contrast, 0), contrast: Math.max(contrast, 0),
hue: hue, hue: hue,
opacity: goog.math.clamp(opacity, 0, 1), opacity: goog.math.clamp(opacity, 0, 1),
saturation: goog.isDef(saturation) ? Math.max(saturation, 0) : 1, saturation: Math.max(saturation, 0),
sourceState: sourceState, sourceState: sourceState,
visible: visible, visible: visible,
extent: extent, extent: extent,
@@ -234,13 +234,12 @@ goog.exportProperty(
/** /**
* @return {number|undefined} The saturation of the layer. * @return {number} The saturation of the layer.
* @observable * @observable
* @api * @api
*/ */
ol.layer.Base.prototype.getSaturation = function() { ol.layer.Base.prototype.getSaturation = function() {
return /** @type {number|undefined} */ ( return /** @type {number} */ (this.get(ol.layer.LayerProperty.SATURATION));
this.get(ol.layer.LayerProperty.SATURATION));
}; };
goog.exportProperty( goog.exportProperty(
ol.layer.Base.prototype, ol.layer.Base.prototype,
@@ -397,7 +396,7 @@ goog.exportProperty(
* values are linear multipliers of the effect (and values over 1 are * values are linear multipliers of the effect (and values over 1 are
* permitted). * permitted).
* *
* @param {number|undefined} saturation The saturation of the layer. * @param {number} saturation The saturation of the layer.
* @observable * @observable
* @api * @api
*/ */