Merged in some wiki fixes into the main docs.

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

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 8c27b42..011ea36 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
         *
@@ -915,7 +915,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 +932,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 +946,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 +962,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
@@ -1261,7 +1260,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;
@@ -1444,6 +1443,9 @@ jQuery.extend({
                                
                                arg = div.childNodes;
                        }
+
+                       if ( arg.length === 0 )
+                               continue;
                        
                        if ( arg[0] == undefined )
                                r.push( arg );
@@ -2184,7 +2186,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 +2216,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
  */