Made jQuery.type more consistent with host objects.

diff --git a/src/core.js b/src/core.js
index 23d40bd092d263bb425cfba9ab14a7825630faae..158f47998ef137564de8ccc059c1b0c7884bb23c 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -69,7 +69,10 @@ var jQuery = function( selector, context ) {
        push = Array.prototype.push,
        slice = Array.prototype.slice,
        trim = String.prototype.trim,
-       indexOf = Array.prototype.indexOf;
+       indexOf = Array.prototype.indexOf,
+       
+       // [[Class]] -> type pairs
+       class2type = {};
 
 jQuery.fn = jQuery.prototype = {
        init: function( selector, context ) {
@@ -487,7 +490,7 @@ jQuery.extend({
        type: function( obj ) {
                return obj == null ?
                        String( obj ) :
-                       toString.call(obj).slice(8, -1).toLowerCase();
+                       class2type[ toString.call(obj) ] || "object";
        },
 
        isPlainObject: function( obj ) {
@@ -799,6 +802,11 @@ jQuery.extend({
        browser: {}
 });
 
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
+       class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
 browserMatch = jQuery.uaMatch( userAgent );
 if ( browserMatch.browser ) {
        jQuery.browser[ browserMatch.browser ] = true;

diff --git a/test/unit/core.js b/test/unit/core.js
index d83f667dc194a38591e44dc52e5e7f99fcdcdd7d..85b8da64fd6b3ed849a62b49fe733ad224ffda2a 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -219,7 +219,7 @@ test("trim", function() {
 });
 
 test("type", function() {
-       expect(18);
+       expect(22);
 
        equals( jQuery.type(null), "null", "null" );
        equals( jQuery.type(undefined), "undefined", "undefined" );
@@ -239,6 +239,10 @@ test("type", function() {
        equals( jQuery.type(new Date()), "date", "Date" );
        equals( jQuery.type(new Function("return;")), "function", "Function" );
        equals( jQuery.type(function(){}), "function", "Function" );
+       equals( jQuery.type(window), "object", "Window" );
+       equals( jQuery.type(document.body), "object", "Element" );
+       equals( jQuery.type(document.createTextNode("foo")), "object", "TextNode" );
+       equals( jQuery.type(document.getElementsByTagName("*")), "object", "NodeList" );
 });
 
 test("isPlainObject", function() {