Changeset 5535

Timestamp:

12/20/07 04:26:53 (1 year ago)

Author:

tschaub

Message:

Serious rewrite in the Ajax namespace by pgiraud to keep up with prototype.js 1.6. Thanks for the effort and for suffering numerous revisions. Now, let's cross our fingers... r=crschmidt,me (closes #1170)

Files:

• trunk/openlayers/lib/OpenLayers/Ajax.js (modified) (11 diffs)
• trunk/openlayers/tests/manual/ajax.html (added)
• trunk/openlayers/tests/manual/ajax.txt (added)

trunk/openlayers/lib/OpenLayers/Ajax.js

@@ -136 +136 @@
-    getTransport: function() {
-        return OpenLayers.Util.Try(
+            function() {return new XMLHttpRequest();},
-            function() {return new ActiveXObject('Msxml2.XMLHTTP');},
-
-
+
-        ) || false;
-    },
@@ -168 +168 @@
-     */
-    register: function(responderToAdd) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-
@@ -183 +193 @@
-     * request - {?}
-     * transport - {?}
-
-
-
+
+
-        var responder;
-        for (var i = 0; i < this.responders.length; i++) {
@@ -194 +203 @@
-                try {
-                    responder[callback].apply(responder, 
-, json
+
-                } catch (e) {}
-            }
@@ -218 +227 @@
-
-/**
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-     * options - {Object}
-     */
-setOptions
+initialize
-        this.options = {
-
-
-
+
+
+
+
+
-        };
-        OpenLayers.Util.extend(this.options, options || {});
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
-
+
-
-/**
@@ -270 +263 @@
- */
-OpenLayers.Ajax.Request = OpenLayers.Class(OpenLayers.Ajax.Base, {
+
+    /**
+     * Property: _complete
+     *
+     * {Boolean}
+     */
+    _complete: false,
-      
-  
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
+
-    initialize: function(url, options) {
+        OpenLayers.Ajax.Base.prototype.initialize.apply(this, [options]);
+        
-        this.transport = OpenLayers.Ajax.getTransport();
-        this.setOptions(options);
-        this.request(url);
-    },
@@ -291 +292 @@
-     */
-    request: function(url) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        try {
-this.url = url
-method == 'get' && parameters.length > 0
-this.url += (this.url.match(/\?/) ? '&' : '?') + parameters
+var response = new OpenLayers.Ajax.Response(this)
+onCreate
+ this.options.onCreate(response)
-            }
-            
-            OpenLayers.Ajax.Responders.dispatch('onCreate', 
-                                                this, 
-this.transport
-
-options.method
+response
+
+method.toUpperCase()
-                                this.url,
-                                this.options.asynchronous);
-    
-            if (this.options.asynchronous) {
-setTimeout(OpenLayers.Function.bind
-(function() {this.respondToReadyState(1);}),this), 10
-
+window.setTimeout
+OpenLayers.Function.bind(this.respondToReadyState, this, 1),
+    10
-            }
-            
@@ -319 +336 @@
-            this.setRequestHeaders();
-    
-var body = this.options.postBody ? this.options.postBody 
-                             : parameters
-options.method == 'post' ? body : null
+this.body =  this.method == 'post' ?
+(this.options.postBody || params) : null
+body
-    
-            // Force Firefox to handle ready state 4 for synchronous requests
-            if (!this.options.asynchronous && 
-                this.transport.overrideMimeType) {
-                
-                this.onStateChange();
-            }
-    
-        } catch (e) {
-            this.dispatchException(e);
-        }
-    },
-     
-    /**
-     * Method: setRequestHeaders
-     */
-    setRequestHeaders: function() {
-        var requestHeaders = [
-            'X-Requested-With',
-            'XMLHttpRequest',
-            'X-Prototype-Version',
-            'OpenLayers'
-        ];
-    
-        if (this.options.method == 'post' && !this.options.postBody) {
-            requestHeaders.push('Content-type',
-                                'application/x-www-form-urlencoded');
-    
-            // 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]);
-        }
-    },
-
-    /**
@@ -374 +355 @@
-    onStateChange: function() {
-        var readyState = this.transport.readyState;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     * Returns:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        try {
-            return this.transport.getResponseHeader(name);
-        } catch (e) {}
-    },
-
-    /** 
-     * Method: evalJSON
-     * 
-     * Returns:
-     * {?}
-     */
-    evalJSON: function() {
-        try {
-            return eval(this.header('X-JSON'));
-        } catch (e) {}
-    },
-
-    /**
-     * Method: evalResponse
-     * 
-     * Returns: 
-     * {?}
-     */
-    evalResponse: function() {
-        try {
-            return eval(this.transport.responseText);
-        } catch (e) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-    },
@@ -469 +491 @@
-     */
-    dispatchException: function(exception) {
-
-
-
-
-
-
-
-
+
+
-        OpenLayers.Ajax.Responders.dispatch('onException', this, exception);
-    }
-    
-});
-
@@ -488 +503 @@
-OpenLayers.Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+/**
+ * Class: OpenLayers.Ajax.Request
+ *
+ * Inherit:
+ *  - <OpenLayers.Ajax.Base>
+ */
+OpenLayers.Ajax.Response = OpenLayers.Class({
+
+    /**
+     * Property: status
+     *
+     * {Integer}
+     */
+    status: 0,
+    
+
+    /**
+     * Property: statusText
+     *
+     * {String}
+     */
+    statusText: '',
+      
+    /**
+     * Constructor: OpenLayers.Ajax.Response
+     * 
+     * Parameters: 
+     * request - {Object}
+     */
+    initialize: function(request) {
+        this.request = request;
+        var transport = this.transport = request.transport,
+            readyState = this.readyState = transport.readyState;
+        
+        if ((readyState > 2 &&
+            !(!!(window.attachEvent && !window.opera))) ||
+            readyState == 4) {
+            this.status       = this.getStatus();
+            this.statusText   = this.getStatusText();
+            this.responseText = transport.responseText == null ?
+                '' : String(transport.responseText);
+        }
+        
+        if(readyState == 4) {
+            var xml = transport.responseXML;
+            this.responseXML  = xml === undefined ? null : xml;
+        }
+    },
+    
+    /**
+     * Method: getStatus
+     */
+    getStatus: OpenLayers.Ajax.Request.prototype.getStatus,
+    
+    /**
+     * Method: getStatustext
+     *
+     * Returns:
+     * {String} - statusText
+     */
+    getStatusText: function() {
+        try {
+            return this.transport.statusText || '';
+        } catch (e) {
+            return '';
+        }
+    },
+    
+    /**
+     * Method: getHeader
+     */
+    getHeader: OpenLayers.Ajax.Request.prototype.getHeader,
+    
+    /** 
+     * Method: getResponseHeader
+     *
+     * Returns:
+     * {?} - response header for given name
+     */
+    getResponseHeader: function(name) {
+        return this.transport.getResponseHeader(name);
+    }
+});
+
-
-/**