Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lang.isArrayLike should return bool for falsey arguments and various other is* #106

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions _base/lang.js
Expand Up @@ -256,13 +256,12 @@ define(["./kernel", "../has", "../sniff"], function(dojo, has){
return (typeof it == "string" || it instanceof String); // Boolean
},

isArray: function(it){
isArray: Array.isArray || function(it){
// summary:
// Return true if it is an Array.
// Does not work on Arrays created in other windows.
// it: anything
// Item to test.
return it && (it instanceof Array || typeof it == "array"); // Boolean
return opts.call(it) == "[object Array]"; // Boolean
},

isFunction: function(it){
Expand Down Expand Up @@ -296,7 +295,7 @@ define(["./kernel", "../has", "../sniff"], function(dojo, has){
// and DOM collections will return true when passed to
// isArrayLike(), but will return false when passed to
// isArray().
return it && it !== undefined && // Boolean
return !!it && // Boolean
// keep out built-in constructors (Number, String, ...) which have length
// properties
!lang.isString(it) && !lang.isFunction(it) &&
Expand Down Expand Up @@ -613,4 +612,3 @@ define(["./kernel", "../has", "../sniff"], function(dojo, has){

return lang;
});

27 changes: 27 additions & 0 deletions tests/_base/lang.js
Expand Up @@ -111,13 +111,40 @@ define(["doh/main", "dojo/_base/array", "dojo/_base/lang", "dojo/_base/kernel"
t.assertTrue(lang.isArray([]));
t.assertTrue(lang.isArray(new Array()));
t.assertFalse(lang.isArray({}));
t.assertFalse(lang.isArray(''));
t.assertFalse(lang.isArray(0));
t.assertFalse(lang.isArray(NaN));
t.assertFalse(lang.isArray(null));
t.assertFalse(lang.isArray(undefined));
if(window){
t.assertFalse(lang.isArray(window));
}
t.assertFalse(lang.isArray(Function));

function Tricky() {}
Tricky.prototype = [];
t.assertFalse(lang.isArray(new Tricky));
},

function isArrayLike(t){
t.assertFalse(lang.isArrayLike("thinger"));
t.assertTrue(lang.isArrayLike(new Array()));
t.assertFalse(lang.isArrayLike({}));
t.assertTrue(lang.isArrayLike(arguments));
t.assertFalse(lang.isArrayLike(""));
t.assertFalse(lang.isArrayLike(false));
t.assertFalse(lang.isArrayLike(NaN));
t.assertFalse(lang.isArrayLike(undefined));
t.assertFalse(lang.isArrayLike(null));
if(window){
t.assertTrue(lang.isArrayLike(window));
}
t.assertFalse(lang.isArrayLike(Function));

t.assertTrue(lang.isArrayLike({0: 1, 1: 2, length: 2}));
function Tricky() {}
Tricky.prototype = [];
t.assertTrue(lang.isArrayLike(new Tricky));
},

function isString(t){
Expand Down