Added some tweaks to $.type to handle null and undefined. Added a bun…

…ch of unit tests as well.
jquery · Aug 27, 2010 · 5d2be7e299131a31cffbd73edea59cde30445608 · 5d2be7e · jdalton · Aug 27, 2010
1 parent 9ce1d09
commit 5d2be7e299131a31cffbd73edea59cde30445608
Unified Split

Showing with 28 additions and 1 deletion.

+5 −1 src/core.js

+23 −0 test/unit/core.js
diff --git a/src/core.js b/src/core.js
@@ -446,7 +446,11 @@ jQuery.extend({
 	},
 	type: function( obj ) {
-  
-		return toString.call(obj).slice(8, -1).toLowerCase();
+  
+		return obj === null ?
+  
+			"null" :
+  
+			obj === undefined ?
+  
+			"undefined" :
+  
+			toString.call(obj).slice(8, -1).toLowerCase();
 	},
 	isPlainObject: function( obj ) {

diff --git a/test/unit/core.js b/test/unit/core.js
@@ -217,6 +217,29 @@ test("trim", function() {
 	equals( jQuery.trim( false ), "false", "Boolean" );
 });
+  
+test("type", function() {
+  
+	expect(18);
+  
+
+  
+	equals( jQuery.type(null), "null", "null" );
+  
+	equals( jQuery.type(undefined), "undefined", "undefined" );
+  
+	equals( jQuery.type(true), "boolean", "Boolean" );
+  
+	equals( jQuery.type(false), "boolean", "Boolean" );
+  
+	equals( jQuery.type(Boolean(true)), "boolean", "Boolean" );
+  
+	equals( jQuery.type(0), "number", "Number" );
+  
+	equals( jQuery.type(1), "number", "Number" );
+  
+	equals( jQuery.type(Number(1)), "number", "Number" );
+  
+	equals( jQuery.type(""), "string", "String" );
+  
+	equals( jQuery.type("a"), "string", "String" );
+  
+	equals( jQuery.type(String("a")), "string", "String" );
+  
+	equals( jQuery.type({}), "object", "Object" );
+  
+	equals( jQuery.type(/foo/), "regexp", "RegExp" );
+  
+	equals( jQuery.type(new RegExp("asdf")), "regexp", "RegExp" );
+  
+	equals( jQuery.type([1]), "array", "Array" );
+  
+	equals( jQuery.type(new Date()), "date", "Date" );
+  
+	equals( jQuery.type(new Function("return;")), "function", "Function" );
+  
+	equals( jQuery.type(function(){}), "function", "Function" );
+  
+});
+  
+
 test("isPlainObject", function() {
 	expect(14);