jquery core: closes #3154. makeArray uses typeof instead of attribute sniffing for...

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 74fd6fc..64c8331 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -90,9 +90,6 @@ jQuery.fn = jQuery.prototype = {
                return this.length;
        },
 
-       // The number of elements contained in the matched element set
-       length: 0,
-
        // Get the Nth element in the matched element set OR
        // Get the whole matched element set as a clean array
        get: function( num ) {
@@ -357,11 +354,10 @@ jQuery.fn = jQuery.prototype = {
        },
 
        val: function( value ) {
-               if ( value == undefined ) {
-
-                       if ( this.length ) {
-                               var elem = this[0];
+               if ( value == undefined ) {                     
+                       var elem = this[0];
 
+                       if ( elem ) {
                                if( jQuery.nodeName( elem, 'option' ) )
                                        return (elem.attributes.value || {}).specified ? elem.value : elem.text;
                                
@@ -393,11 +389,11 @@ jQuery.fn = jQuery.prototype = {
                                                }
                                        }
 
-                                       return values;
+                                       return values;                          
+                               }
 
                                // Everything else, we just grab the value
-                               } else
-                                       return (this[0].value || "").replace(/\r/g, "");
+                               return (elem.value || "").replace(/\r/g, "");
 
                        }
 
@@ -1129,13 +1125,15 @@ jQuery.extend({
                return (text || "").replace( /^\s+|\s+$/g, "" );
        },
 
+       // NOTE: Due to the conflict with Scriptaculous (http://dev.jquery.com/ticket/3248)
+       // We remove support for functions since jQuery 1.3
        makeArray: function( array ) {
                var ret = [];
 
                if( array != null ){
                        var i = array.length;
-                       //the window, strings and functions also have 'length'
-                       if( i == null || array.split || array.setInterval || array.call )
+                       // The window, strings (and functions) also have 'length'
+                       if( i == null || typeof array == 'function' || array.setInterval )
                                ret[0] = array;
                        else
                                while( i )