X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=6e56fa45dd2444396abcdebf0dcf41fa4ac2cc62;hb=eee853f120b61673191ffbbbf97e8ebb2f545751;hp=c2549c7be8798b11d74208717627af443081e63d;hpb=7654d3b833c0161aacc66abd6d861f53f9d8c395;p=jquery.git

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index c2549c7..6e56fa4 100644
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -95,8 +95,12 @@ jQuery.fn.extend({
 	},
 
 	/**
-	 * A function for serializing a set of input elements into
-	 * a string of data.
+	 * Serializes a set of input elements into a string of data.
+	 * This will serialize all given elements. If you need 
+	 * serialization similar to the form submit of a browser,
+	 * you should use the form plugin. This is also true for
+	 * selects with multiple attribute set, only a single option
+	 * is serialized.
 	 *
 	 * @example $("input[@type=text]").serialize();
 	 * @before <input type='text' name='name' value='John'/>
@@ -104,8 +108,9 @@ jQuery.fn.extend({
 	 * @after name=John&location=Boston
 	 * @desc Serialize a selection of input elements to a string
 	 *
-	 * @test var data = $(':input').serialize();
-	 * ok( data == 'action=Test&text2=Test&radio1=on&radio2=on&check=on&=on&hidden=&foo[bar]=&name=name&button=&=foobar&select1=&select2=3&select3=1', 'Check form serialization as query string' );
+	 * @test var data = $(':input').not('button').serialize();
+	 * // ignore button, IE takes text content as value, not relevant for this test
+	 * ok( data == 'action=Test&text2=Test&radio1=on&radio2=on&check=on&=on&hidden=&foo[bar]=&name=name&=foobar&select1=&select2=3&select3=1', 'Check form serialization as query string' );
 	 *
 	 * @name serialize
 	 * @type String
@@ -216,21 +221,26 @@ if ( jQuery.browser.msie && typeof XMLHttpRequest == "undefined" )
  *     ok( counter.error == 2, 'Check failed request' );
  *     ok( counter.success == 0, 'Check failed request' );
  *     ok( counter.complete == 3, 'Check failed request' );
- *     counter.error = 0; counter.success = 0; counter.complete = 0;
- *     $.ajaxTimeout(0);
- *     $.ajax({url: "data/name.php?wait=5", global: false, success: success, error: error, complete: function() {
- *       ok( counter.error == 0, 'Check sucesful request without globals' );
- *       ok( counter.success == 1, 'Check sucesful request without globals' );
- *       ok( counter.complete == 0, 'Check sucesful request without globals' );
- *       counter.error = 0; counter.success = 0; counter.complete = 0;
- *       $.ajaxTimeout(500);
- *       $.ajax({url: "data/name.php?wait=5", global: false, success: success, error: error, complete: function() {
- *         ok( counter.error == 1, 'Check failedrequest without globals' );
- *         ok( counter.success == 0, 'Check failed request without globals' );
- *         ok( counter.complete == 0, 'Check failed request without globals' );
- *         start();
- *       }});
- *     }});
+ *     start();
+ *   }});
+ * }});
+ 
+ * @test stop(); var counter = { complete: 0, success: 0, error: 0 };
+ * counter.error = 0; counter.success = 0; counter.complete = 0;
+ * var success = function() { counter.success++ };
+ * var error = function() { counter.error++ };
+ * $.ajaxTimeout(0);
+ * $.ajax({url: "data/name.php", global: false, success: success, error: error, complete: function() {
+ *   ok( counter.error == 0, 'Check sucesful request without globals' );
+ *   ok( counter.success == 1, 'Check sucesful request without globals' );
+ *   ok( counter.complete == 0, 'Check sucesful request without globals' );
+ *   counter.error = 0; counter.success = 0; counter.complete = 0;
+ *   $.ajaxTimeout(500);
+ *   $.ajax({url: "data/name.php?wait=5", global: false, success: success, error: error, complete: function() {
+ *      ok( counter.error == 1, 'Check failed request without globals' );
+ *      ok( counter.success == 0, 'Check failed request without globals' );
+ *      ok( counter.complete == 0, 'Check failed request without globals' );
+ *      start();
  *   }});
  * }});
  * 
@@ -271,19 +281,6 @@ jQuery.extend({
 	 *   }
 	 * )
 	 *
-	 * @test stop();
-	 * $.get("data/dashboard.xml", function(xml) {
-	 *     var content = [];
-     *     $('tab', xml).each(function(k) {
-     *         // workaround for IE needed here, $(this).text() throws an error
-     *         // content[k] = $.trim(this.firstChild.data) || $(this).text();
-     *         content[k] = $(this).text();
-     *     });
-	 *	   ok( content[0] && content[0].match(/blabla/), 'Check first tab' );
-	 *     ok( content[1] && content[1].match(/blublu/), 'Check second tab' );
-	 *     start();
-	 * });
-	 *
 	 * @name $.get
 	 * @type jQuery
 	 * @param String url The URL of the page to load.
@@ -508,6 +505,8 @@ jQuery.extend({
 	 *     start();
 	 *   }
 	 * });
+	 * // reset timeout
+	 * $.ajaxTimeout(0);
 	 * 
 	 *
 	 * @name $.ajaxTimeout