Minor bug fixes.
[jquery.git] / jquery / jquery.js
index e54f468..02c22fb 100644 (file)
@@ -29,7 +29,7 @@ function jQuery(a,c) {
         * Handle support for overriding other $() functions. Way too many libraries
         * provide this function to simply ignore it and overwrite it.
         */
-
+       /*
        // Check to see if this is a possible collision case
        if ( jQuery._$ && !c && a.constructor == String && 
       
@@ -42,6 +42,7 @@ function jQuery(a,c) {
 
                        // Use the default method, in case it works some voodoo
                        return jQuery._$( a );
+       */
 
        // Watch for when a jQuery object is passed as the selector
        if ( a.jquery )
@@ -55,10 +56,14 @@ function jQuery(a,c) {
        if ( window == this )
                return new jQuery(a,c);
 
+       // Handle HTML strings
+       var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
+       if ( m ) a = jQuery.clean( [ m[1] ] );
+
        // Watch for when an array is passed in
-       this.get( a.constructor == Array ?
+       this.get( a.constructor == Array || a.length && a[0] != undefined && a[0].nodeType ?
                // Assume that it's an array of DOM Elements
-               a :
+               jQuery.merge( a, [] ) :
 
                // Find the matching elements and save them for later
                jQuery.find( a, c ) );
@@ -168,7 +173,7 @@ jQuery.fn = jQuery.prototype = {
                                // Return just the object
                                this[num];
        },
-       
+
        /**
         * Execute a function within the context of every matched element.
         * This means that every time the passed-in function is executed
@@ -303,7 +308,7 @@ jQuery.fn = jQuery.prototype = {
         * @param Object value The value to set the property to.
         */
        css: function( key, value ) {
-               return this.attr( key, value, "css" );
+               return this.attr( key, value, "curCSS" );
        },
        
        /**
@@ -511,33 +516,39 @@ jQuery.fn = jQuery.prototype = {
         * @param String expr An expression to search with.
         */
 
-        /**
-         * Removes all elements from the set of matched elements that do not
-         * match at least one of the expressions passed to the function. This 
-         * method is used when you want to filter the set of matched elements 
-         * through more than one expression.
-         *
-         * Elements will be retained in the jQuery object if they match at
-         * least one of the expressions passed.
-         *
-         * @example $("p").filter([".selected", ":first"])
-         * @before <p>Hello</p><p>Hello Again</p><p class="selected">And Again</p>
-         * @result $("p").filter([".selected", ":first"]) == [ <p>Hello</p>, <p class="selected">And Again</p> ]
-         *
-         * @name filter
-         * @type jQuery
-         * @param Array<String> exprs A set of expressions to evaluate against
-         */
+       /**
+        * Removes all elements from the set of matched elements that do not
+        * match at least one of the expressions passed to the function. This 
+        * method is used when you want to filter the set of matched elements 
+        * through more than one expression.
+        *
+        * Elements will be retained in the jQuery object if they match at
+        * least one of the expressions passed.
+        *
+        * @example $("p").filter([".selected", ":first"])
+        * @before <p>Hello</p><p>Hello Again</p><p class="selected">And Again</p>
+        * @result $("p").filter([".selected", ":first"]) == [ <p>Hello</p>, <p class="selected">And Again</p> ]
+        *
+        * @name filter
+        * @type jQuery
+        * @param Array<String> exprs A set of expressions to evaluate against
+        */
        filter: function(t) {
-               return t.constructor == Array ?
-                       // Multi Filtering
-                       this.pushStack( jQuery.map(this,function(a){
+               return this.pushStack(
+                       t.constructor == Array &&
+                       jQuery.map(this,function(a){
                                for ( var i = 0; i < t.length; i++ )
                                        if ( jQuery.filter(t[i],[a]).r.length )
                                                return a;
-                       }), arguments ) :
-                       
-                       this.pushStack( jQuery.filter(t,this).r, arguments );
+                       }) ||
+
+                       t.constructor == Boolean &&
+                       ( t ? this.get() : [] ) ||
+
+                       t.constructor == Function &&
+                       jQuery.grep( this, t ) ||
+
+                       jQuery.filter(t,this).r, arguments );
        },
        
        /**
@@ -598,18 +609,18 @@ jQuery.fn = jQuery.prototype = {
         * @param Array<Element> els An array of Elements to add
         */
 
-        /**
-         * Adds a single Element to the set of matched elements. This is used to
-         * add a single Element to a jQuery object.
-         *
-         * @example $("p").add( document.getElementById("a") )
-         * @before <p>Hello</p><p><span id="a">Hello Again</span></p>
-         * @result [ <p>Hello</p>, <span id="a">Hello Again</span> ]
-         *
-         * @name add
-         * @type jQuery
-         * @param Element el An Element to add
-         */
+       /**
+        * Adds a single Element to the set of matched elements. This is used to
+        * add a single Element to a jQuery object.
+        *
+        * @example $("p").add( document.getElementById("a") )
+        * @before <p>Hello</p><p><span id="a">Hello Again</span></p>
+        * @result [ <p>Hello</p>, <span id="a">Hello Again</span> ]
+        *
+        * @name add
+        * @type jQuery
+        * @param Element el An Element to add
+        */
        add: function(t) {
                return this.pushStack( jQuery.merge( this, t.constructor == String ?
                        jQuery.find(t) : t.constructor == Array ? t : [t] ), arguments );
@@ -625,7 +636,7 @@ jQuery.fn = jQuery.prototype = {
         * @type Boolean
         */
        is: function(expr) {
-               return jQuery.filter(expr,this).r.length > 0;
+               return expr ? jQuery.filter(expr,this).r.length > 0 : this.length > 0;
        },
        
        /**
@@ -655,10 +666,12 @@ jQuery.fn = jQuery.prototype = {
                                } else
                                        obj = tbody[0];
                        }
-       
+                       //alert( obj );
                        for ( var i = ( dir < 0 ? a.length - 1 : 0 );
-                               i != ( dir < 0 ? dir : a.length ); i += dir )
-                                       fn.apply( obj, [ a[i] ] );
+                               i != ( dir < 0 ? dir : a.length ); i += dir ) {
+                                       fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
+                                       //alert( fn );
+                       }
                });
        },
        
@@ -798,7 +811,7 @@ new function() {
                 * @type jQuery
                 * @param String expr An expression to filter the next Elements with
                 */
-               next: "a.nextSibling",
+               next: "jQuery.sibling(a).next",
 
                /**
                 * Get a set of elements containing the unique previous siblings of each of the 
@@ -828,7 +841,7 @@ new function() {
                 * @type jQuery
                 * @param String expr An expression to filter the previous Elements with
                 */
-               prev: "a.previousSibling",
+               prev: "jQuery.sibling(a).prev",
 
                /**
                 * Get a set of elements containing all of the unique siblings of each of the 
@@ -861,12 +874,15 @@ new function() {
                var t = axis[i];
                jQuery.fn[ i ] = function(a) {
                        var ret = jQuery.map(this,t);
-                       if ( a ) ret = jQuery.filter(a,ret).r;
+                       if ( a && a.constructor == String )
+                               ret = jQuery.filter(a,ret).r;
                        return this.pushStack( ret, arguments );
                };
-       }
+       };
+
+       // appendTo, prependTo, beforeTo, afterTo
        
-       /*var to = ["append","prepend","before","after"];
+       var to = ["append","prepend","before","after"];
        
        for ( var i = 0; i < to.length; i++ ) new function(){
                var n = to[i];
@@ -877,15 +893,35 @@ new function() {
                                        $(a[i])[n]( this );
                        });
                };
-       }*/
+       };
        
        var each = {
+               /**
+                * Displays each of the set of matched elements if they are hidden.
+                * 
+                * @example $("p").show()
+                * @before <p style="display: none">Hello</p>
+                * @result [ <p style="display: block">Hello</p> ]
+                *
+                * @name show
+                * @type jQuery
+                */
                show: function(){
                        this.style.display = this.oldblock ? this.oldblock : "";
                        if ( jQuery.css(this,"display") == "none" )
                                this.style.display = "block";
                },
-               
+
+               /**
+                * Hides each of the set of matched elements if they are shown.
+                *
+                * @example $("p").hide()
+                * @before <p>Hello</p>
+                * @result [ <p style="display: none">Hello</p> ]
+                *
+                * @name hide
+                * @type jQuery
+                */
                hide: function(){
                        this.oldblock = jQuery.css(this,"display");
                        if ( this.oldblock == "none" )
@@ -893,41 +929,153 @@ new function() {
                        this.style.display = "none";
                },
                
+               /**
+                * Toggles each of the set of matched elements. If they are shown,
+                * toggle makes them hidden. If they are hidden, toggle
+                * makes them shown.
+                *
+                * @example $("p").toggle()
+                * @before <p>Hello</p><p style="display: none">Hello Again</p>
+                * @result [ <p style="display: none">Hello</p>, <p style="display: block">Hello Again</p> ]
+                *
+                * @name toggle
+                * @type jQuery
+                */
                toggle: function(){
                        var d = jQuery.css(this,"display");
                        $(this)[ !d || d == "none" ? "show" : "hide" ]();
                },
                
+               /**
+                * Adds the specified class to each of the set of matched elements.
+                *
+                * @example ("p").addClass("selected")
+                * @before <p>Hello</p>
+                * @result [ <p class="selected">Hello</p> ]
+                * 
+                * @name addClass
+                * @type jQuery
+                * @param String class A CSS class to add to the elements
+                */
                addClass: function(c){
                        jQuery.className.add(this,c);
                },
                
+               /**
+                * The opposite of addClass. Removes the specified class from the
+                * set of matched elements.
+                *
+                * @example ("p").removeClass("selected")
+                * @before <p class="selected">Hello</p>
+                * @result [ <p>Hello</p> ]
+                *
+                * @name removeClass
+                * @type jQuery
+                * @param String class A CSS class to remove from the elements
+                */
                removeClass: function(c){
                        jQuery.className.remove(this,c);
                },
        
+               /**
+                * Adds the specified class if it is present. Remove it if it is
+                * not present.
+                *
+                * @example ("p").toggleClass("selected")
+                * @before <p>Hello</p><p class="selected">Hello Again</p>
+                * @result [ <p class="selected">Hello</p>, <p>Hello Again</p> ]
+                *
+                * @name toggleClass
+                * @type jQuery
+                * @param String class A CSS class with which to toggle the elements
+                */
                toggleClass: function( c ){
-                       jQuery.className[ jQuery.className.has(this,a) ? "remove" : "add" ](this,c);
+                       jQuery.className[ jQuery.className.has(this,c) ? "remove" : "add" ](this,c);
                },
                
+               /**
+                * TODO: Document
+                */
                remove: function(a){
                        if ( !a || jQuery.filter( [this], a ).r )
                                this.parentNode.removeChild( this );
                },
        
+               /**
+                * Removes all child nodes from the set of matched elements.
+                *
+                * @example ("p").empty()
+                * @before <p>Hello, <span>Person</span> <a href="#">and person</a></p>
+                * @result [ <p></p> ]
+                *
+                * @name empty
+                * @type jQuery
+                */
                empty: function(){
                        while ( this.firstChild )
                                this.removeChild( this.firstChild );
                },
                
+               /**
+                * Binds a particular event (like click) to a each of a set of match elements.
+                *
+                * @example $("p").bind( "click", function() { alert("Hello"); } )
+                * @before <p>Hello</p>
+                * @result [ <p>Hello</p> ]
+                *
+                * Cancel a default action and prevent it from bubbling by returning false
+                * from your function.
+                *
+                * @example $("form").bind( "submit", function() { return false; } )
+                *
+                * Cancel a default action by using the preventDefault method.
+                *
+                * @example $("form").bind( "submit", function() { e.preventDefault(); } )
+                *
+                * Stop an event from bubbling by using the stopPropogation method.
+                *
+                * @example $("form").bind( "submit", function() { e.stopPropogation(); } )
+                *
+                * @name bind
+                * @type jQuery
+                * @param String type An event type
+                * @param Function fn A function to bind to the event on each of the set of matched elements
+                */
                bind: function( type, fn ) {
+                       if ( fn.constructor == String )
+                               fn = new Function("e", ( !fn.indexOf(".") ? "$(this)" : "return " ) + fn);
                        jQuery.event.add( this, type, fn );
                },
                
+               /**
+                * The opposite of bind. Removes a bound event from each of a set of matched
+                * elements. You must pass the identical function that was used in the original 
+                * bind method.
+                *
+                * @example $("p").unbind( "click", function() { alert("Hello"); } )
+                * @before <p>Hello</p>
+                * @result [ <p>Hello</p> ]
+                *
+                * @name unbind
+                * @type jQuery
+                * @param String type An event type
+                * @param Function fn A function to unbind from the event on each of the set of matched elements
+                */
                unbind: function( type, fn ) {
                        jQuery.event.remove( this, type, fn );
                },
                
+               /**
+                * Trigger a particular event.
+                *
+                * @example $("p").trigger("click")
+                * @before <p>Hello</p>
+                * @result [ <p>Hello</p> ]
+                *
+                * @name trigger
+                * @type jQuery
+                * @param String type An event type
+                */
                trigger: function( type ) {
                        jQuery.event.trigger( this, type );
                }
@@ -953,24 +1101,24 @@ new function() {
        };
        
        for ( var i in attr ) new function() {
-               var n = attr[i];
+               var n = attr[i] || i;
                jQuery.fn[ i ] = function(h) {
                        return h == undefined ?
                                this.length ? this[0][n] : null :
                                this.attr( n, h );
                };
-       }
-       
-       var css = "width,height,top,left,position,float,overflow,color,background".split(",");
-       
+       };
+
+       var css = "width,height,top,left,position,float,overflow,color,background".split(","); 
+
        for ( var i in css ) new function() {
                var n = css[i];
                jQuery.fn[ i ] = function(h) {
                        return h == undefined ?
-                               this.length ? jQuery.css( this[0], n ) : null :
+                               ( this.length ? jQuery.css( this[0], n ) : null ) :
                                this.css( n, h );
                };
-       }
+       };
 
 }
 
@@ -1029,7 +1177,11 @@ jQuery.extend({
        
                        return p == "height" ? oHeight : oWidth;
                }
-               
+
+               return jQuery.curCSS( e, p );
+       },
+
+       curCSS: function(e,p) {
                var r;
        
                if (e.style[p])
@@ -1104,8 +1256,8 @@ jQuery.extend({
                        contains: "(a.innerText||a.innerHTML).indexOf(m[3])>=0",
                        
                        // Visibility
-                       visible: "jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!='hidden'",
-                       hidden: "jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')=='hidden'",
+                       visible: "a.type!='hidden'&&jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!='hidden'",
+                       hidden: "a.type=='hidden'||jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')=='hidden'",
                        
                        // Form elements
                        enabled: "!a.disabled",
@@ -1140,7 +1292,7 @@ jQuery.extend({
        
        find: function( t, context ) {
                // Make sure that the context is a DOM Element
-               if ( context && context.getElementsByTagName == undefined )
+               if ( context && context.nodeType == undefined )
                        context = null;
        
                // Set the correct context (if none is provided)
@@ -1257,50 +1409,53 @@ jQuery.extend({
                } else
                        return "";
        },
+
+       // The regular expressions that power the parsing engine
+       parse: [
+               // Match: [@value='test'], [@foo]
+               [ "\\[ *(@)S *([!*$^=]*) *Q\\]", 1 ],
+
+               // Match: [div], [div p]
+               [ "(\\[)Q\\]", 0 ],
+
+               // Match: :contains('foo')
+               [ "(:)S\\(Q\\)", 0 ],
+
+               // Match: :even, :last-chlid
+               [ "([:.#]*)S", 0 ]
+       ],
        
        filter: function(t,r,not) {
                // Figure out if we're doing regular, or inverse, filtering
                var g = not !== false ? jQuery.grep :
                        function(a,f) {return jQuery.grep(a,f,true);};
                
-               // Look for a string-like sequence
-               var str = "([a-zA-Z*_-][a-zA-Z0-9_-]*)";
-               
-               // Look for something (optionally) enclosed with quotes
-               var qstr = " *'?\"?([^'\"]*)'?\"? *";
-       
-               while ( t && /^[a-zA-Z\[*:.#]/.test(t) ) {
-                       // Handles:
-                       // [@foo], [@foo=bar], etc.
-                       var re = new RegExp("^\\[ *@" + str + " *([!*$^=]*) *" + qstr + "\\]");
-                       var m = re.exec(t);
-       
-                       // Re-organize the match
-                       if ( m ) m = ["", "@", m[2], m[1], m[3]];
-                               
-                       // Handles:
-                       // [div], [.foo]
-                       if ( !m ) {
-                               re = new RegExp("^(\\[)" + qstr + "\\]");
-                               m = re.exec(t);
-                       }
-                       
-                       // Handles:
-                       // :contains(test), :not(.foo)
-                       if ( !m ) {
-                               re = new RegExp("^(:)" + str + "\\(" + qstr + "\\)");
-                               m = re.exec(t);
-                       }
-                       
-                       // Handles:
-                       // :foo, .foo, #foo, foo
-                       if ( !m ) {
-                               re = new RegExp("^([:.#]*)" + str);
-                               m = re.exec(t);
+               while ( t && /^[a-z[({<*:.#]/i.test(t) ) {
+
+                       var p = jQuery.parse;
+
+                       for ( var i = 0; i < p.length; i++ ) {
+                               var re = new RegExp( "^" + p[i][0]
+
+                                       // Look for a string-like sequence
+                                       .replace( 'S', "([a-z*_-][a-z0-9_-]*)" )
+
+                                       // Look for something (optionally) enclosed with quotes
+                                       .replace( 'Q', " *'?\"?([^'\"]*)'?\"? *" ), "i" );
+
+                               var m = re.exec( t );
+
+                               if ( m ) {
+                                       // Re-organize the match
+                                       if ( p[i][1] )
+                                               m = ["", m[1], m[3], m[2], m[4]];
+
+                                       // Remove what we just matched
+                                       t = t.replace( re, "" );
+
+                                       break;
+                               }
                        }
-                       
-                       // Remove what we just matched
-                       t = t.replace( re, "" );
        
                        // :not() is a special case that can be optomized by
                        // keeping it out of the expression list
@@ -1380,6 +1535,7 @@ jQuery.extend({
                        n == "even" && type.n % 2 == 0 ||
                        n == "odd" && type.n % 2 ||
                        type[n] == a;
+               type.prev = type[type.n - 1];
                type.next = type[type.n + 1];
                return type;
        },