Make lower param of clamp required. [closes #2949]

This commit is contained in:
John-David Dalton
2017-01-24 10:32:12 -08:00
parent c5c0ff77b6
commit 868fd1253b
2 changed files with 10 additions and 20 deletions

View File

@@ -3,18 +3,14 @@
* *
* @private * @private
* @param {number} number The number to clamp. * @param {number} number The number to clamp.
* @param {number} [lower] The lower bound. * @param {number} lower The lower bound.
* @param {number} upper The upper bound. * @param {number} upper The upper bound.
* @returns {number} Returns the clamped number. * @returns {number} Returns the clamped number.
*/ */
function baseClamp(number, lower, upper) { function baseClamp(number, lower, upper) {
if (number === number) { if (number === number) {
if (upper !== undefined) { number = number <= upper ? number : upper;
number = number <= upper ? number : upper; number = number >= lower ? number : lower;
}
if (lower !== undefined) {
number = number >= lower ? number : lower;
}
} }
return number; return number;
} }

View File

@@ -7,7 +7,7 @@ import toNumber from './toNumber.js';
* @since 4.0.0 * @since 4.0.0
* @category Number * @category Number
* @param {number} number The number to clamp. * @param {number} number The number to clamp.
* @param {number} [lower] The lower bound. * @param {number} lower The lower bound.
* @param {number} upper The upper bound. * @param {number} upper The upper bound.
* @returns {number} Returns the clamped number. * @returns {number} Returns the clamped number.
* @example * @example
@@ -19,18 +19,12 @@ import toNumber from './toNumber.js';
* // => 5 * // => 5
*/ */
function clamp(number, lower, upper) { function clamp(number, lower, upper) {
if (upper === undefined) { lower = toNumber(lower);
upper = lower; lower = lower === lower ? lower : 0;
lower = undefined;
} upper = toNumber(upper);
if (upper !== undefined) { upper = upper === upper ? upper : 0;
upper = toNumber(upper);
upper = upper === upper ? upper : 0;
}
if (lower !== undefined) {
lower = toNumber(lower);
lower = lower === lower ? lower : 0;
}
return baseClamp(toNumber(number), lower, upper); return baseClamp(toNumber(number), lower, upper);
} }