From ac191a28a54302613d706af1f04236af8f195e5b Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 5 Oct 2011 15:32:34 -0400 Subject: [PATCH] merging in #324 as _.initial --- test/arrays.js | 14 +++++++------- underscore.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/arrays.js b/test/arrays.js index 3d5cc3327..80da71f6f 100644 --- a/test/arrays.js +++ b/test/arrays.js @@ -24,13 +24,13 @@ $(document).ready(function() { equals(_.flatten(result).join(','), '2,3,2,3', 'works well with _.map'); }); - test("arrays: init", function() { - equals(_.init([1,2,3,4,5]).join(", "), "1, 2, 3, 4", 'working init()'); - equals(_.init([1,2,3,4],2).join(", "), "1, 2", 'init can take an index'); - var result = (function(){ return _(arguments).init(); })(1, 2, 3, 4); - equals(result.join(", "), "1, 2, 3", 'init works on arguments object'); - result = _.map([[1,2,3],[1,2,3]], _.init); - equals(_.flatten(result).join(','), '1,2,1,2', 'init works with _.map'); + test("arrays: initial", function() { + equals(_.initial([1,2,3,4,5]).join(", "), "1, 2, 3, 4", 'working initial()'); + equals(_.initial([1,2,3,4],2).join(", "), "1, 2", 'initial can take an index'); + var result = (function(){ return _(arguments).initial(); })(1, 2, 3, 4); + equals(result.join(", "), "1, 2, 3", 'initial works on arguments object'); + result = _.map([[1,2,3],[1,2,3]], _.initial); + equals(_.flatten(result).join(','), '1,2,1,2', 'initial works with _.map'); }); test("arrays: last", function() { diff --git a/underscore.js b/underscore.js index dfc875d3a..e183d070a 100644 --- a/underscore.js +++ b/underscore.js @@ -327,7 +327,7 @@ // the arguments object. Passing **n** will return all the values in // the array, excluding the last N. The **guard** check allows it to work with // `_.map`. - _.init = function(array, n, guard) { + _.initial = function(array, n, guard) { return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n)); };