Ticket #964: wfs_request_abort.diff

tests/Tile/test_WFS.html

@@ -25 +25 @@
-        t.ok( tile.id != null, "tile is given an id");
-        t.ok( tile.events != null, "tile's events intitialized");
-    }
-
-    function test_Tile_WFS_requestSuccess(t) {
-        t.plan(1);
-        var layer = {}; // bogus layer
-        var position = new OpenLayers.Pixel(10,20);
-        var bounds = new OpenLayers.Bounds(1,2,3,4);
-        var url = "bobob";
-        var size = new OpenLayers.Size(5,6);
-        
-        tile = new OpenLayers.Tile.WFS(layer, position, bounds, url, size);
-        tile.destroy();
-        tile.requestSuccess({'requestText': '<xml><foo /></xml>'});
-        t.ok(true, "Didn't fail after calling requestSuccess on destroyed tile.");
-        
-    }
-    
-    function test_99_Tile_WFS_destroy(t) {
-6
+8
-
-        var layer = {}; // bogus layer
-        var position = new OpenLayers.Pixel(10,20);
@@ -54 +39 @@
-        tile.events.destroy = function() {
-            t.ok(true, "tile events destroy() called");
-        };
-
-
+
+
+
+
+
+
+
+
+
+
-        tile.destroy();
-
-        t.ok(tile.layer == null, "tile.layer set to null");
@@ -64 +57 @@
-        t.ok(tile.position == null, "tile.position set to null");
-        
-        t.ok(tile.events == null, "tile.events set to null");
+        t.ok(_gAbort, "request transport is aborted");
+        
+        tile.requestSuccess({'requestText': '<xml><foo /></xml>'});
+        t.ok(true, "Didn't fail after calling requestSuccess on destroyed tile.");
-    }
-
-  </script>

lib/OpenLayers/Tile/WFS.js

@@ -28 +28 @@
-     */
-    url: null,
-    
+    /**
+     * Property: request
+     * {OpenLayers.Ajax.Request}
+     */
+    request: null,
+    
-    /** TBD 3.0 - reorder the parameters to the init function to put URL 
-     *             as last, so we can continue to call tile.initialize() 
-     *             without changing the arguments. 
@@ -57 +63 @@
-        this.destroyAllFeatures();
-        this.features = null;
-        this.url = null;
+        if (this.request) {
+            this.request.transport.abort();
+        }
-    },
-
-    /** 
@@ -97 +106 @@
-    * failure - {function}
-    */
-    loadFeaturesForRegion:function(success, failure) {
-
+this.request = 
-    },
-    
-    /**

lib/OpenLayers/Ajax.js

@@ -49 +49 @@
- * onFailure - {Function} callback for failure
- *
- * Both callbacks optional (though silly)
+ *
+ * Returns:
+ * {OpenLayers.Ajax.Request} - Created AJAX request
- */
-OpenLayers.loadURL = function(uri, params, caller,
-                                  onComplete, onFailure) {
@@ -64 +67 @@
-                           : OpenLayers.nullHandler;
-
-    // from prototype.js
-
+return 
-                     {   method: 'get', 
-                         parameters: params,
-                         onComplete: success, 
@@ -135 +138 @@
-     */
-    getTransport: function() {
-        return OpenLayers.Util.Try(
+            function() {return new XMLHttpRequest();},
-            function() {return new ActiveXObject('Msxml2.XMLHTTP');},
-
-
+
-        ) || false;
-    },
-
@@ -167 +170 @@
-     * responderToAdd - {?}
-     */
-    register: function(responderToAdd) {
-
-
-
-
-
-
+  
+  
+  
+  
+  
+  
-    },
-
-    /**
+     * Method: unregister
+     *  
+     * Parameters:
+     * responderToRemove - {?}
+     */
+    register: function(responderToRemove) {
+        OpenLayers.Util.removeItem(responderToRemove);
+    },
+
+    /**
-     * Method: dispatch
-     * 
-     * Parameters:
-     * callback - {?}
-     * request - {?}
-     * transport - {?}
-     * json - {?}
-     */
-, json
+
-        var responder;
-        for (var i = 0; i < this.responders.length; i++) {
-            responder = this.responders[i];
@@ -193 +205 @@
-                typeof responder[callback] == 'function') {
-                try {
-                    responder[callback].apply(responder, 
-, json
+
-                } catch (e) {}
-            }
-        }
@@ -217 +229 @@
-});
-
-/**
-
-
+
- */
-
-
-
+
+
-    /**
+     * Constructor: OpenLayers.Ajax
+     * 
+     * Parameters: 
+     * options - {Object}
+     */
+    /**
-     * Function: setOptions
-     * 
-     * Parameters:
-     * options - {Object}
-     */
-setOptions
+initialize
-        this.options = {
-
-
-
+
+
+
+
+
-        };
-        OpenLayers.Util.extend(this.options, options || {});
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-
+)
-
-
-/**
- * Class: OpenLayers.Ajax.Request
- *
@@ -269 +271 @@
- *  - <OpenLayers.Ajax.Base>
- */
-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);
-    },
-
@@ -290 +300 @@
-     * url - {String}
-     */
-    request: function(url) {
-
-
-
+
+
+
+
+
+
+
+
-        }
+
+        this.parameters = params;        
+        
+        if (params = OpenLayers.Util.getParameterString(params)) {
+            // when GET, append parameters to URL
+            if (this.method == 'get') {
+                this.url += (this.url.include('?') ? '&' : '?') + params;
+            } else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
+                params += '&_=';
+            }
+        }
-        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
+response
-    
-options.method
+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),
+    1000
-            }
-            
-            this.transport.onreadystatechange = 
-                OpenLayers.Function.bind(this.onStateChange, this);    
-            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: onStateChange
+     */
+    onStateChange: function() {
+        var readyState = this.transport.readyState;
+        if (readyState > 1 && !((readyState == 4) && this._complete)) {
+            this.respondToReadyState(this.transport.readyState);
+        }
+    },
-     
-    /**
-     * Method: setRequestHeaders
-     */
-    setRequestHeaders: function() {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-            }
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
+
+
+
-        }
-    },
-
+
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-     * Returns:
-?}
+Boolean} - 
-     */
-
-
-
-
+
+
+
-    },
-
- 
-evalJSON
- 
+
+
+getStatus
+
-     * Returns:
-?}
+Integer} - Status
-     */
-evalJSON
+getStatus
-        try {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        } catch (e) {
-this.dispatchException(e);
+return 0
-        }
-    },
-
@@ -423 +443 @@
-     * readyState - {?}
-     */
-    respondToReadyState: function(readyState) {
-event
-transport = this.transport, json = this.evalJSON(
+state
+response = new OpenLayers.Ajax.Response(this
-    
-event
+state
-            try {
-
-
-
-
-
-
+
+
+
+
-            } catch (e) {
-                this.dispatchException(e);
-            }
-    
-
-
-
-
+
-        }
-    
-        try {
-event
-transport, json
-event
+state
+response
+state
-                                                 this, 
-
-
+
-        } catch (e) {
-            this.dispatchException(e);
-        }
-    
-// Avoid memory leak in MSIE: clean up the oncomplete event handler
-if (event == 'Complete') {
+if (state == 'Complete') {
+    // avoid memory leak in MSIE: clean up
-            this.transport.onreadystatechange = OpenLayers.Ajax.emptyFunction;
-        }
-    },
+    
+    /**
+     * Method: getHeader
+     * 
+     * Parameters:
+     * name - {String} Header name
+     *
+     * Returns:
+     * {?} - response header for the given name
+     */
+    getHeader: function(name) {
+        try {
+            return this.transport.getResponseHeader(name);
+        } catch (e) {
+            return null
+        }
+    },
-
-    /**
-     * Method: dispatchException
@@ -468 +499 @@
-     * exception - {?}
-     */
-    dispatchException: function(exception) {
-
-
-
-
-
-
-
-
+
+
-        OpenLayers.Ajax.Responders.dispatch('onException', this, exception);
-    }
-    
-});
-
-/** 
@@ -489 +513 @@
-  ['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);
+    }
+});
+
+
+/**
- * Function: getElementsByTagNameNS
- * 
- * Parameters: