Converted a lot of for loops to use jQuery.each() instead.

[jquery.git] / src / jquery / jquery.js

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 8c27b42..151f68f 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -320,17 +320,17 @@ jQuery.fn = jQuery.prototype = {
         * Returns -1 if the object wasn't found.
         *
         * @example $("*").index( $('#foobar')[0] ) 
-        * @before <div id="foobar"></div><b></b><span id="foo"></span>
+        * @before <div id="foobar"><b></b><span id="foo"></span></div>
         * @result 0
         * @desc Returns the index for the element with ID foobar
         *
-        * @example $("*").index( $('#foo')) 
-        * @before <div id="foobar"></div><b></b><span id="foo"></span>
+        * @example $("*").index( $('#foo')[0] ) 
+        * @before <div id="foobar"><b></b><span id="foo"></span></div>
         * @result 2
-        * @desc Returns the index for the element with ID foo
+        * @desc Returns the index for the element with ID foo within another element
         *
-        * @example $("*").index( $('#bar')) 
-        * @before <div id="foobar"></div><b></b><span id="foo"></span>
+        * @example $("*").index( $('#bar')[0] ) 
+        * @before <div id="foobar"><b></b><span id="foo"></span></div>
         * @result -1
         * @desc Returns -1, as there is no element with ID bar
         *
@@ -544,12 +544,18 @@ jQuery.fn = jQuery.prototype = {
         * @cat DOM/Attributes
         */
        text: function(e) {
-               var type = this.length && this[0].innerText == undefined ?
-                       "textContent" : "innerText";
-                       
-               return e == undefined ?
-                       jQuery.map(this, function(a){ return a[ type ]; }).join("") :
-                       this.each(function(){ this[ type ] = e; });
+               if ( typeof e == "string" )
+                       return this.empty().append( document.createTextNode( e ) );
+
+               var t = "";
+               jQuery.each( e || this, function(){
+                       jQuery.each( this.childNodes, function(){
+                               if ( this.nodeType != 8 )
+                                       t += this.nodeType != 1 ?
+                                               this.nodeValue : jQuery.fn.text([ this ]);
+                       });
+               });
+               return t;
        },
 
        /**
@@ -915,7 +921,7 @@ jQuery.fn = jQuery.prototype = {
         *
         * @name not
         * @type jQuery
-        * @param Array|jQuery elems A set of elements to remove from the jQuery set of matched elements.
+        * @param jQuery elems A set of elements to remove from the jQuery set of matched elements.
         * @cat DOM/Traversing
         */
        not: function(t) {
@@ -932,11 +938,11 @@ jQuery.fn = jQuery.prototype = {
        },
 
        /**
-        * Adds the elements matched by the expression to the jQuery object. This
-        * can be used to concatenate the result sets of two expressions.
+        * Adds more elements, matched by the given expression,
+        * to the set of matched elements.
         *
         * @example $("p").add("span")
-        * @before <p>Hello</p><p><span>Hello Again</span></p>
+        * @before <p>Hello</p><span>Hello Again</span>
         * @result [ <p>Hello</p>, <span>Hello Again</span> ]
         *
         * @name add
@@ -946,7 +952,8 @@ jQuery.fn = jQuery.prototype = {
         */
         
        /**
-        * Adds the on the fly created elements to the jQuery object.
+        * Adds more elements, created on the fly, to the set of
+        * matched elements.
         *
         * @example $("p").add("<span>Again</span>")
         * @before <p>Hello</p>
@@ -961,15 +968,13 @@ jQuery.fn = jQuery.prototype = {
        /**
         * Adds one or more Elements to the set of matched elements.
         *
-        * This is used to add a set of Elements 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> ]
         *
-        * @example $("p").add([document.getElementById("a"), document.getElementById("b")])
-        * @before <p>Hello</p><p><span id="a">Hello Again</span><span id="b">And Again</span></p>
-        * @result [ <p>Hello</p>, <span id="a">Hello Again</span>, <span id="b">And Again</span> ]
+        * @example $("p").add( document.forms[0].elements )
+        * @before <p>Hello</p><p><form><input/><button/></form>
+        * @result [ <p>Hello</p>, <input/>, <button/> ]
         *
         * @name add
         * @type jQuery
@@ -1095,8 +1100,9 @@ jQuery.fn = jQuery.prototype = {
                        if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() == "TR" )
                                obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
 
-                       for ( var i = 0, al = a.length; i < al; i++ )
-                               fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
+                       jQuery.each( a, function(){
+                               fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+                       });
 
                });
        }
@@ -1261,7 +1267,7 @@ jQuery.extend({
                                return value.call( elem );
 
                        // Handle passing in a number to a CSS property
-                       if ( value.constructor == Number && type == "css" )
+                       if ( value.constructor == Number && type == "curCSS" )
                                return value + "px";
 
                        return value;
@@ -1309,10 +1315,10 @@ jQuery.extend({
                if ( p == "height" || p == "width" ) {
                        var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
 
-                       for ( var i = 0, dl = d.length; i < dl; i++ ) {
-                               old["padding" + d[i]] = 0;
-                               old["border" + d[i] + "Width"] = 0;
-                       }
+                       jQuery.each( d, function(){
+                               old["padding" + this] = 0;
+                               old["border" + this + "Width"] = 0;
+                       });
 
                        jQuery.swap( e, old, function() {
                                if (jQuery.css(e,"display") != "none") {
@@ -1388,10 +1394,8 @@ jQuery.extend({
        clean: function(a) {
                var r = [];
 
-               for ( var i = 0, al = a.length; i < al; i++ ) {
-                       var arg = a[i];
-
-                       if ( !arg ) continue;
+               jQuery.each( a, function(i,arg){
+                       if ( !arg ) return;
 
                        if ( arg.constructor == Number )
                                arg = arg.toString();
@@ -1444,13 +1448,16 @@ jQuery.extend({
                                
                                arg = div.childNodes;
                        }
+
+                       if ( arg.length === 0 )
+                               return;
                        
                        if ( arg[0] == undefined )
                                r.push( arg );
                        else
                                r = jQuery.merge( r, arg );
 
-               }
+               });
 
                return r;
        },
@@ -2184,7 +2191,7 @@ jQuery.each( [ "eq", "lt", "gt", "contains" ], function(i,n){
  *
  * @name width
  * @type jQuery
- * @param Number|String val Set the CSS property to the specified value.
+ * @param String|Number val Set the CSS property to the specified value.
  * @cat CSS
  */
  
@@ -2214,7 +2221,7 @@ jQuery.each( [ "eq", "lt", "gt", "contains" ], function(i,n){
  *
  * @name height
  * @type jQuery
- * @param Number|String val Set the CSS property to the specified value.
+ * @param String|Number val Set the CSS property to the specified value.
  * @cat CSS
  */