Changeset 5448

Timestamp:

11/07/06 06:23:31 (2 years ago)

Author:

sam

Message:

prototype: A slew of Ajax improvements. Closes #6366.

Files:

• spinoffs/prototype/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/src/ajax.js (modified) (6 diffs)
• spinoffs/prototype/src/hash.js (modified) (2 diffs)
• spinoffs/prototype/src/string.js (modified) (1 diff)
• spinoffs/prototype/test/unit/ajax.html (modified) (5 diffs)
• spinoffs/prototype/test/unit/fixtures/content.html (added)
• spinoffs/prototype/test/unit/hash.html (modified) (2 diffs)
• spinoffs/prototype/test/unit/string.html (modified) (1 diff)

spinoffs/prototype/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* A slew of Ajax improvements.  Closes #6366.  [mislav, sam]
+  
+  Public-facing changes include:
+  - HTTP method can be specified in either lowercase or uppercase, and uppercase is always used when opening the XHR connection
+  - Added 'encoding' option (for POST) with a default of 'UTF-8'
+  - Ajax.Request now recognizes all the JavaScript MIME types we're aware of
+  - PUT body support with the 'postBody' option
+  - HTTP authentication support with the 'username' and 'password' options
+  - Query parameters can be passed as a string or as a hash
+  - Fixed both String.toQueryParams and Hash.toQueryString when handling empty values
+  - Request headers can now be specified as a hash with the 'requestHeaders' option
-
-* Improve performance of the common case where $ is called with a single argument. Closes #6347. [sam, rvermillion, mislav]

spinoffs/prototype/src/ajax.js

@@ -18 +18 @@
-  },
-
-ToAdd
-ToAdd
-ToAdd
-
-
-ToRemove
-ToRemove
+
+
+
+
+
+
+
-  },
-  
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-responder[callback] && 
+
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
@@ -43 +43 @@
-  onCreate: function() {
-    Ajax.activeRequestCount++;
-
-
+
-  onComplete: function() {
-    Ajax.activeRequestCount--;
@@ -57 +56 @@
-      asynchronous: true,
-      contentType:  'application/x-www-form-urlencoded',
+      encoding:     'UTF-8',
-      parameters:   ''
-    }
-    Object.extend(this.options, options || {});
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
@@ -85 +79 @@
-
-  request: function(url) {
-eters = this.options.parameters || ''
-eters.length > 0) parameters += '&_=
-
-/* Simulate other verbs over post */
-if (this.options.method != 'get' && this.options.method != 'post') {
-eters += (parameters.length > 0 ? '&' : '') + '_method=' +
+s = this.options.parameters
+s.any()) params['_'] = '
+
+if (!['get', 'post'].include(this.options.method)) {
+  // simulate other verbs over post
+s['_method'] =
-      this.options.method = 'post';
-    }
-    
-
-
-
-
-
+
+
+
+
+
+
+
+
-      Ajax.Responders.dispatch('onCreate', this, this.transport);
-
-
-
+
+
+
+
-
-      if (this.options.asynchronous)
-        setTimeout(function() { this.respondToReadyState(1) }.bind(this), 10);
-
+
-      this.transport.onreadystatechange = this.onStateChange.bind(this);
-      this.setRequestHeaders();
-
-
-
+
+
+
+
-
-      /* Force Firefox to handle ready state 4 for synchronous requests */
-      if (!this.options.asynchronous && this.transport.overrideMimeType)
-        this.onStateChange();
-    
-} 
+}
+
-      this.dispatchException(e);
-    }
-  },
-
-  setRequestHeaders: function() {
-    var requestHeaders = 
-      ['X-Requested-With', 'XMLHttpRequest',
-       'X-Prototype-Version', Prototype.Version,
-       'Accept', 'text/javascript, text/html, application/xml, text/xml, */*'];
-
-    if (this.options.method == 'post') {
-      requestHeaders.push('Content-type', this.options.contentType);
-
-      /* Force "Connection: close" for Mozilla browsers to work around
-       * a bug where XMLHttpReqeuest sends an incorrect Content-length
-       * header. See Mozilla Bugzilla #246651. 
-       */
-      if (this.transport.overrideMimeType)
-        requestHeaders.push('Connection', 'close');
-    }
-
-    if (this.options.requestHeaders)
-      requestHeaders.push.apply(requestHeaders, this.options.requestHeaders);
-
-    for (var i = 0; i < requestHeaders.length; i += 2)
-      this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]);
-  },
-
-  onStateChange: function() {
-    var readyState = this.transport.readyState;
-!=
+>
-      this.respondToReadyState(this.transport.readyState);
-  },
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  },
-
-  respondToReadyState: function(readyState) {
-event
+state
-    var transport = this.transport, json = this.evalJSON();
-
-event
+state
-      try {
-        (this.options['on' + this.transport.status]
-responseIsS
+s
-         || Prototype.emptyFunction)(transport, json);
-      } catch (e) {
-        this.dispatchException(e);
-      }
-
-
-
-
-
-
-
-
+
+
+
+
+
-    } catch (e) {
-      this.dispatchException(e);
-    }
-    
-
-
+
+
+
+
+
+
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  dispatchException: function(exception) {
-    (this.options.onException || Prototype.emptyFunction)(this, exception);
@@ -211 +230 @@
-Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
-  initialize: function(container, url, options) {
-
-
-
-
-
-
+
+
+
+
+
-    this.transport = Ajax.getTransport();
-    this.setOptions(options);
-
-    var onComplete = this.options.onComplete || Prototype.emptyFunction;
-object
+param
-      this.updateContent();
-object
+param
-    }).bind(this);
-
@@ -230 +248 @@
-
-  updateContent: function() {
-
-
+
-    var response = this.transport.responseText;
-    
-
-
-
-
-
+
+
+
+
-        new this.options.insertion(receiver, response);
-
-
-
-
-
-
+
+
+
+
+
-      if (this.onComplete)
-        setTimeout(this.onComplete.bind(this), 10);

spinoffs/prototype/src/hash.js

@@ -21 +21 @@
-  
-  merge: function(hash) {
-$H(this)
+this
-      mergedHash[pair.key] = pair.value;
-      return mergedHash;
@@ -29 +29 @@
-  toQueryString: function() {
-    return this.map(function(pair) {
+      if (!pair.value && pair.value !== 0) pair[1] = '';
+      if (!pair.key) return;
-      return pair.map(encodeURIComponent).join('=');
-    }).join('&');

spinoffs/prototype/src/string.js

@@ -76 +76 @@
-  
-  toQueryParams: function() {
-
+
+
+
-    return pairs.inject({}, function(params, pairString) {
-      var pair  = pairString.split('=');

spinoffs/prototype/test/unit/ajax.html

@@ -24 +24 @@
-<div id="testlog"> </div>
-<div id="content"></div>
+<div id="content2" style="color:red"></div>
-
-<!-- Tests follow -->
@@ -31 +32 @@
-    
-    setup: function(){
-
+
+
-    },
-    
@@ -38 +40 @@
-      new Ajax.Request("fixtures/hello.js", {
-        asynchronous: false,
-get
+GET
-        onComplete: function(response) { eval(response.responseText) }
-      });
@@ -48 +50 @@
-    testAsynchronousRequest: function() {with(this) {
-      assertEqual("", $("content").innerHTML);
+      
-      new Ajax.Request("fixtures/hello.js", {
-        asynchronous: true,
@@ -57 +60 @@
-        assertEqual("Hello world!", h2.innerHTML);
-      });
+    }},
+    
+    testUpdater: function() {with(this) {
+      assertEqual("", $("content").innerHTML);
+      
+      new Ajax.Updater("content", "fixtures/content.html", { method:'get' });
+      
+      // lowercase comparison because of MSIE which presents HTML tags in uppercase
+      var sentence = ("Pack my box with <em>five dozen</em> liquor jugs! " +
+        "Oh, how <strong>quickly</strong> daft jumping zebras vex...").toLowerCase();
+
+      wait(1000,function(){
+        assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
+        
+        $('content').update('');
+        assertEqual("", $("content").innerHTML);
+         
+        Ajax.Responders.register({onComplete: function(req){
+          assertEqual("fixtures/content.html?pet=monkey&_=", req.url);
+        }.bind(this) });
+        
+        new Ajax.Updater({ success:"content", failure:"content2" },
+          "fixtures/content.html", { method:'get', parameters:{ pet:'monkey' } });
+        
+        new Ajax.Updater("", "fixtures/content.html", { method:'get', parameters:"pet=monkey" });
+        
+        wait(1000,function(){
+          assertEqual(sentence, $("content").innerHTML.strip().toLowerCase());
+          assertEqual("", $("content2").innerHTML);
+        });
+      });
-    }}
-    

spinoffs/prototype/test/unit/hash.html

@@ -38 +38 @@
-      c: 'C',
-      d: 'D#'
-
+
+
+
+
+
-  };
+  
-  new Test.Unit.Runner({
-    
@@ -65 +70 @@
-      assertEqual('a=A%23',                  $H(Fixtures.one).toQueryString())
-      assertEqual('a=A&b=B&c=C&d=D%23',      $H(Fixtures.many).toQueryString())
+      assertEqual("a=b&c=",                  $H(Fixtures.value_undefined).toQueryString())
+      assertEqual("a=b&c=",                  $H(Fixtures.value_null).toQueryString())
+      assertEqual("a=b&c=0",                 $H(Fixtures.value_zero).toQueryString())
-    }},
-    

spinoffs/prototype/test/unit/string.html

@@ -207 +207 @@
-    
-    testToQueryParams: function() {with(this) {
-
+
+
+
-      
-      var result = 'a'.toQueryParams();