Update JSDocs/functions after review

This commit is contained in:
Nicholas L
2016-01-20 18:57:20 +13:00
parent e08a88b76c
commit d81af7594c

View File

@@ -182,17 +182,17 @@ ol.array.flatten = function(arr) {
}; };
// TODO: Optimisation by storing length or iterating backwards etc
/** /**
* @param {Array<VALUE>} arr The array to modify. * @param {Array<VALUE>} arr The array to modify.
* @param {Array<VALUE>|VALUE} data The elements or arrays of elements * @param {Array<VALUE>|VALUE} data The elements or arrays of elements
* to add to arr1. * to add to arr.
* @template VALUE * @template VALUE
*/ */
ol.array.extend = function(arr, data) { ol.array.extend = function(arr, data) {
var i; var i;
var extension = goog.isArrayLike(data) ? data : [data]; var extension = goog.isArrayLike(data) ? data : [data];
for (i = 0; i < extension.length; i++) { var length = extension.length
for (i = 0; i < length; i++) {
arr[arr.length] = extension[i]; arr[arr.length] = extension[i];
} }
} }
@@ -206,31 +206,27 @@ ol.array.extend = function(arr, data) {
*/ */
ol.array.remove = function(arr, obj) { ol.array.remove = function(arr, obj) {
var i = arr.indexOf(obj); var i = arr.indexOf(obj);
if (i > -1) { var found = i > -1;
if (found) {
arr.splice(i, 1); arr.splice(i, 1);
} }
return i > -1; return found;
} }
/** /**
* @param {Array<VALUE>} arr The array to modify. * @param {Array<VALUE>} arr The array to search in.
* @param {?function(this:THISVAL, VALUE, number, ?) : boolean} func The function to compare. * @param {function(VALUE, number, ?) : boolean} func The function to compare.
* @param {THISVAL=} opt_thisArg Optional this argument for the function. * @template VALUE
* @template VALUE,THISVAL * @return {VALUE} The element found.
* @return {VALUE} If the element was removed.
*/ */
ol.array.find = function(arr, func, opt_thisArg) { ol.array.find = function(arr, func) {
if (typeof func !== 'function') { var length = arr.length >>> 0;
throw new TypeError('func must be a function');
}
var list = Object(arr);
var length = list.length >>> 0;
var value; var value;
for (var i = 0; i < length; i++) { for (var i = 0; i < length; i++) {
value = list[i]; value = arr[i];
if (func.call(opt_thisArg, value, i, list)) { if (func(value, i, arr)) {
return value; return value;
} }
} }
@@ -241,15 +237,14 @@ ol.array.find = function(arr, func, opt_thisArg) {
/** /**
* @param {Array|NodeList|Arguments|{length: number}} arr1 The first array to compare. * @param {Array|NodeList|Arguments|{length: number}} arr1 The first array to compare.
* @param {Array|NodeList|Arguments|{length: number}} arr2 The second array to compare. * @param {Array|NodeList|Arguments|{length: number}} arr2 The second array to compare.
* @param {Function=} opt_equalsFn Optional comparison function.
* @return {boolean} Whether the two arrays are equal. * @return {boolean} Whether the two arrays are equal.
*/ */
ol.array.equals = function(arr1, arr2, opt_equalsFn) { ol.array.equals = function(arr1, arr2) {
if (!goog.isArrayLike(arr1) || !goog.isArrayLike(arr2) || arr1.length !== arr2.length) { if (!goog.isArrayLike(arr1) || !goog.isArrayLike(arr2) || arr1.length !== arr2.length) {
return false; return false;
} }
var length = arr1.length; var length = arr1.length;
var equalsFn = opt_equalsFn !== undefined ? opt_equalsFn : function(a, b) { var equalsFn = function(a, b) {
return a === b; return a === b;
}; };
for (var i = 0; i < length; i++) { for (var i = 0; i < length; i++) {
@@ -260,6 +255,11 @@ ol.array.equals = function(arr1, arr2, opt_equalsFn) {
return true; return true;
} }
/**
* @param {Array<*>} arr The array to sort (modifies original).
* @param {Function} compareFnc Comparison function.
*/
ol.array.stableSort = function(arr, compareFnc) { ol.array.stableSort = function(arr, compareFnc) {
var length = arr.length; var length = arr.length;
var tmp = Array(arr.length); var tmp = Array(arr.length);
@@ -267,9 +267,7 @@ ol.array.stableSort = function(arr, compareFnc) {
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
tmp[i] = {index: i, value: arr[i]}; tmp[i] = {index: i, value: arr[i]};
} }
var compare = compareFnc || function(a, b) { var compare = compareFnc || ol.array.numberSafeCompareFunction;
return a > b ? 1 : a < b ? -1 : 0;
};
tmp.sort(function(a, b) { tmp.sort(function(a, b) {
return compare(a.value, b.value) || a.index - b.index; return compare(a.value, b.value) || a.index - b.index;
}); });
@@ -280,32 +278,28 @@ ol.array.stableSort = function(arr, compareFnc) {
/** /**
* @param {Array<*>} arr The first array to compare.. * @param {Array<*>} arr The array to search in.
* @param {Function} func Optional comparison function. * @param {Function} func Comparison function.
* @param {*=} opt_thisArg Optional this argument for the function. * @return {number} Return index.
* @return {number} Whether the two arrays are equal.
*/ */
ol.array.findIndex = function(arr, func, opt_thisArg) { ol.array.findIndex = function(arr, func) {
if (typeof func !== 'function') { var index;
throw new TypeError('func must be a function'); var found = !arr.every(function(el, idx) {
} index = idx;
var list = Object(arr); return !func(el, idx, arr);
var length = list.length >>> 0; });
var value; return found ? index : -1;
for (var i = 0; i < length; i++) {
value = list[i];
if (func.call(opt_thisArg, value, i, list)) {
return i;
}
}
return -1;
} }
/**
* @param {Array<*>} arr The array to test.
* @param {Function=} opt_func Comparison function.
* @param {boolean=} opt_strict Strictly sorted (default false).
* @return {boolean} Return index.
*/
ol.array.isSorted = function(arr, opt_func, opt_strict) { ol.array.isSorted = function(arr, opt_func, opt_strict) {
var compare = opt_func || function(a, b) { var compare = opt_func || ol.array.numberSafeCompareFunction;
return a > b ? 1 : a < b ? -1 : 0;
};
return arr.every(function(currentVal, index) { return arr.every(function(currentVal, index) {
if (index === 0) { if (index === 0) {
return true; return true;