Removed (hopefully) all references to $ within the jQuery code itself

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

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 1426604..5aeb943 100644 (file)
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -39,6 +39,13 @@ jQuery.fn.extend({
         *      start();
         * });
         *
+        * @test stop(); // check if load can be called with only url
+        * $('#first').load("data/name.php");
+        * setTimeout(function() {
+        *   ok( $('#first').text() == 'ERROR', 'Check if load works without callback');
+        *   start();
+        * }, 100);
+        *
         * @name load
         * @type jQuery
         * @param String url The URL of the HTML file to load.
@@ -80,9 +87,9 @@ jQuery.fn.extend({
                                self.html(res.responseText).each( callback, [res.responseText, status] );
                                
                                // Execute all the scripts inside of the newly-injected HTML
-                               $("script", self).each(function(){
+                               jQuery("script", self).each(function(){
                                        if ( this.src )
-                                               $.getScript( this.src );
+                                               jQuery.getScript( this.src );
                                        else
                                                eval.call( window, this.text || this.textContent || this.innerHTML || "" );
                                });
@@ -95,8 +102,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,15 +115,16 @@ 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
         * @cat AJAX
         */
        serialize: function() {
-               return $.param( this );
+               return jQuery.param( this );
        }
        
 });
@@ -216,21 +228,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 +288,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.
@@ -298,7 +302,8 @@ jQuery.extend({
                        data = null;
                }
                
-               if ( data ) url += "?" + jQuery.param(data);
+               // append ? + data or & + data, in case there are already params
+               if ( data ) url += ((url.indexOf("?") > -1) ? "&" : "?") + jQuery.param(data);
                
                // Build and start the HTTP Request
                jQuery.ajax( "GET", url, null, function(r, status) {
@@ -507,6 +512,8 @@ jQuery.extend({
         *     start();
         *   }
         * });
+        * // reset timeout
+        * $.ajaxTimeout(0);
         * 
         *
         * @name $.ajaxTimeout