Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-07 10:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #504 from mwilliamson/master

Browse Source 
Don't call iterable.toArray in _.toArray if not a function
This commit is contained in:
Jeremy Ashkenas
2012-04-02 12:27:38 -07:00
parent 6f5489fcab c8ec654e6b
commit 62114126d9
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/collections.js
View File

@@ -264,8 +264,8 @@ $(document).ready(function() {
test('collections: shuffle', function() { test('collections: shuffle', function() {
var numbers = _.range(10); var numbers = _.range(10);
var shuffled = _.shuffle(numbers).sort(); var shuffled = _.shuffle(numbers).sort();
notStrictEqual(numbers, shuffled, 'original object is unmodified'); notStrictEqual(numbers, shuffled, 'original object is unmodified');
equal(shuffled.join(','), numbers.join(','), 'contains the same members before and after shuffle'); equal(shuffled.join(','), numbers.join(','), 'contains the same members before and after shuffle');
}); });
@@ -278,6 +278,14 @@ $(document).ready(function() {
var numbers = _.toArray({one : 1, two : 2, three : 3}); var numbers = _.toArray({one : 1, two : 2, three : 3});
equal(numbers.join(', '), '1, 2, 3', 'object flattened into array'); equal(numbers.join(', '), '1, 2, 3', 'object flattened into array');
var objectWithToArrayFunction = {toArray: function() {
return [1, 2, 3];
}};
equal(_.toArray(objectWithToArrayFunction).join(', '), '1, 2, 3', 'toArray method used if present');
var objectWithToArrayValue = {toArray: 1};
equal(_.toArray(objectWithToArrayValue).join(', '), '1', 'toArray property ignored if not a function');
}); });
test('collections: size', function() { test('collections: size', function() {

2
underscore.js
View File

@@ -304,7 +304,7 @@
// Safely convert anything iterable into a real, live array. // Safely convert anything iterable into a real, live array.
_.toArray = function(iterable) { _.toArray = function(iterable) {
if (!iterable) return []; if (!iterable) return [];
if (iterable.toArray) return iterable.toArray(); if (iterable.toArray && _.isFunction(iterable.toArray)) return iterable.toArray();
if (_.isArray(iterable)) return slice.call(iterable); if (_.isArray(iterable)) return slice.call(iterable);
if (_.isArguments(iterable)) return slice.call(iterable); if (_.isArguments(iterable)) return slice.call(iterable);
return _.values(iterable); return _.values(iterable);