jquery core: closes #3241. The 'length' property isn't set to jQuery's prototype...

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index fdf5072..bcb9af8 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -21,7 +21,7 @@ var jQuery = window.jQuery = window.$ = function( selector, context ) {
 
 // A simple way to check for HTML strings or ID strings
 // (both of which we optimize for)
-var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,
+var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,
 
 // Is it a simple selector
        isSimple = /^.[^:#\[\.]*$/,
@@ -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 ) {
@@ -266,7 +263,7 @@ jQuery.fn = jQuery.prototype = {
                        return jQuery.find( selector, elem );
                });
 
-               return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ?
+               return this.pushStack( /[^+>] [^+>]/.test( selector ) ?
                        jQuery.unique( elems ) :
                        elems );
        },
@@ -357,11 +354,13 @@ 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;
+                               
                                // We need to handle select boxes special
                                if ( jQuery.nodeName( elem, "select" ) ) {
                                        var index = elem.selectedIndex,
@@ -379,7 +378,7 @@ jQuery.fn = jQuery.prototype = {
 
                                                if ( option.selected ) {
                                                        // Get the specifc value for the option
-                                                       value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value;
+                                                       value = jQuery(option).val();
 
                                                        // We don't need an array for one selects
                                                        if ( one )
@@ -390,17 +389,20 @@ 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, "");
 
                        }
 
                        return undefined;
                }
 
+               if( value.constructor == Number )
+                       value += '';
+
                return this.each(function(){
                        if ( this.nodeType != 1 )
                                return;
@@ -438,7 +440,7 @@ jQuery.fn = jQuery.prototype = {
        },
 
        eq: function( i ) {
-               return this.slice( i, i + 1 );
+               return this.slice( i, +i + 1 );
        },
 
        slice: function() {
@@ -610,9 +612,10 @@ jQuery.extend({
        },
 
        // See test/unit/core.js for details concerning this function.
+       // Since 1.3 DOM methods and function like alert
+       // aren't supported. They return false on IE (#2968).
        isFunction: function( fn ) {
-               return !!fn && typeof fn != "string" && !fn.nodeName &&
-                       fn.constructor != Array && /^[\s[]?function/.test( fn + "" );
+               return fn instanceof Function;
        },
 
        // check if an element is in a (or is an) XML document
@@ -940,12 +943,12 @@ jQuery.extend({
                        context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
 
                jQuery.each(elems, function(i, elem){
+                       if ( typeof elem == 'number' )
+                               elem += '';
+
                        if ( !elem )
                                return;
 
-                       if ( elem.constructor == Number )
-                               elem += '';
-
                        // Convert html string into DOM nodes
                        if ( typeof elem == "string" ) {
                                // Fix "XHTML"-style tags in all browsers
@@ -1057,7 +1060,7 @@ jQuery.extend({
                                elem.parentNode.selectedIndex;
 
                        // If applicable, access the attribute via the DOM 0 way
-                       if ( notxml && !special && name in elem ) {
+                       if ( name in elem && notxml && !special ) {
                                if ( set ){
                                        // We can't allow the type property to be changed (since it causes problems in IE)
                                        if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
@@ -1080,11 +1083,13 @@ jQuery.extend({
                                // convert the value to a string (all browsers do this but IE) see #1070
                                elem.setAttribute( name, "" + value );
 
-                       if ( msie && special && notxml )
-                               return elem.getAttribute( name, 2 );
-
-                       return elem.getAttribute( name );
+                       var attr = msie && notxml && special
+                                       // Some attributes require a special call on IE
+                                       ? elem.getAttribute( name, 2 )
+                                       : elem.getAttribute( name );
 
+                       // Non-existent attributes return null, we normalize to undefined
+                       return attr === null ? undefined : attr;
                }
 
                // elem is actually elem.style ... set the style
@@ -1216,7 +1221,7 @@ var userAgent = navigator.userAgent.toLowerCase();
 
 // Figure out what browser is being used
 jQuery.browser = {
-       version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1],
+       version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],
        safari: /webkit/.test( userAgent ),
        opera: /opera/.test( userAgent ),
        msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
@@ -1239,7 +1244,8 @@ jQuery.extend({
                styleFloat: styleFloat,
                readonly: "readOnly",
                maxlength: "maxLength",
-               cellspacing: "cellSpacing"
+               cellspacing: "cellSpacing",
+               rowspan: "rowSpan"
        }
 });
 
@@ -1303,7 +1309,7 @@ jQuery.each({
        remove: function( selector ) {
                if ( !selector || jQuery.filter( selector, [ this ] ).r.length ) {
                        // Prevent memory leaks
-                       jQuery( "*", this ).add(this).each(function(){
+                       jQuery( "*", this ).add([this]).each(function(){
                                jQuery.event.remove(this);
                                jQuery.removeData(this);
                        });
@@ -1362,4 +1368,4 @@ jQuery.each([ "Height", "Width" ], function(i, name){
 // Helper function used by the dimensions and offset modules
 function num(elem, prop) {
        return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
-}
\ No newline at end of file
+}