@@ -107,18 +107,18 @@ Array.prototype['all?'] = function(block) { }; /** - * An alias for <b>#areAny</b>. + * An alias for <b>#isAny</b>. * * @param {Function} block (optional) The function to execute. Should have one * parameter * @returns {Boolean} <tt>true</tt> if <i>block</t> returns a value other than * <tt>false</tt> or <tt>null</tt> for any element * - * @see #areAny #areAny - * @see #all? #all? + * @see #isAny #isAny + * @see #all? #all? */ Array.prototype['any?'] = function(block) { - return this.areAny.apply(this, arguments); + return this.isAny.apply(this, arguments); }; /** @@ -157,7 +157,7 @@ Array.prototype['any?'] = function(block) { * @returns {Boolean} <tt>true</tt> if <i>block</t> does not return * <tt>false</tt> or <tt>null</tt> for any element * - * @see #areAny #areAny + * @see #isAny #isAny */ Array.prototype.areAll = function(block) { if (block === undefined) { @@ -174,58 +174,6 @@ Array.prototype.areAll = function(block) { }; /** - * Passes each element in the array to <i>block</i>, returning <tt>true</tt> if - * <i>block</i> ever returns a value other than <tt>false</tt> or <tt>null</tt>. - * If <i>block</i> is not given, Rouge adds an implicit block that will return - * <tt>true</tt> if any of the elements is not <tt>false</tt> or <tt>null</tt>. - * - * <pre> - * var array = ['foo', 'bar', 'bizzle']; - * var result = array.areAny(function(item) { - * return item.length >= 3; - * }); - * result // => true - * array // => ['foo', 'bar', 'bizzle'] - * - * var array = ['foo', 'bar', 'bizzle']; - * var result = array.areAny(function(item) { - * return item.length <= 2; - * }); - * result // => false - * array // => ['foo', 'bar', 'bizzle'] - * </pre> - * - * Without the optional <i>block</i>: - * - * <pre> - * var array = [null, true, 99]; - * var result = array.areAny(); - * result // => true - * array // => [null, true, 99] - * </pre> - * - * @param {Function} block (optional) The function to execute. Should have one - * parameter - * @returns {Boolean} <tt>true</tt> if <i>block</t> returns a value other than - * <tt>false</tt> or <tt>null</tt> for any element - * - * @see #areAll #areAll - */ -Array.prototype.areAny = function(block) { - if (block === undefined) { - block = function(item) { - return ! Array.helpers.isNullOrFalse(item); - }; - } - var result = false; - Array.helpers.iterate.apply(this, [function(item, i) { - result = block(this[i]); - if (! Array.helpers.isNullOrFalse(result)) return true; - }]); - return ! Array.helpers.isNullOrFalse(result); -}; - -/** * Creates a different array of the same size. Invokes <i>block</i> once for * each element in the array, passing that element as an argument. * @@ -718,6 +666,58 @@ Array.prototype.inject = function(initial, block) { }; /** + * Passes each element in the array to <i>block</i>, returning <tt>true</tt> if + * <i>block</i> ever returns a value other than <tt>false</tt> or <tt>null</tt>. + * If <i>block</i> is not given, Rouge adds an implicit block that will return + * <tt>true</tt> if any of the elements is not <tt>false</tt> or <tt>null</tt>. + * + * <pre> + * var array = ['foo', 'bar', 'bizzle']; + * var result = array.isAny(function(item) { + * return item.length >= 3; + * }); + * result // => true + * array // => ['foo', 'bar', 'bizzle'] + * + * var array = ['foo', 'bar', 'bizzle']; + * var result = array.isAny(function(item) { + * return item.length <= 2; + * }); + * result // => false + * array // => ['foo', 'bar', 'bizzle'] + * </pre> + * + * Without the optional <i>block</i>: + * + * <pre> + * var array = [null, true, 99]; + * var result = array.isAny(); + * result // => true + * array // => [null, true, 99] + * </pre> + * + * @param {Function} block (optional) The function to execute. Should have one + * parameter + * @returns {Boolean} <tt>true</tt> if <i>block</t> returns a value other than + * <tt>false</tt> or <tt>null</tt> for any element + * + * @see #areAll #areAll + */ +Array.prototype.isAny = function(block) { + if (block === undefined) { + block = function(item) { + return ! Array.helpers.isNullOrFalse(item); + }; + } + var result = false; + Array.helpers.iterate.apply(this, [function(item, i) { + result = block(this[i]); + if (! Array.helpers.isNullOrFalse(result)) return true; + }]); + return ! Array.helpers.isNullOrFalse(result); +}; + +/** * An alias for <b>#collect</b>. * * @param {Function} block The function to execute. Should have one parameter src/lib/core.js 8b50608fc8d4485ad8acc1485bd36b9b667d2f42 Nils Jonsson nils@alumni.rice.edu http://github.com/njonsson/rouge/commit/972f58c6ed34f61cd9dc67b25c728f013c03ef18 972f58c6ed34f61cd9dc67b25c728f013c03ef18 2009-06-06T21:13:06-07:00 2009-06-06T21:13:06-07:00 Rename Array#areAny to Array#isAny d80748d2930da3310062315c4b3a409b5b30e97c Nils Jonsson nils@alumni.rice.edu