Ticket #964: requestAbort.patch

tests/Tile/test_WFS.html

@@ -41 +41 @@
-        
-    }
-    
+    function test_Tile_WFS_loadFeaturesForRegion(t) {
+        t.plan(9);
+        
+        var tile = {
+            'url': {}
+        };
+
+        var g_Success = {};     
+
+        var tLoadURL = OpenLayers.loadURL;
+        OpenLayers.loadURL = function(url, params, caller, onComplete) {
+            t.ok(url == tile.url, "tile's url correctly passed as 1st param to loadURL");
+            t.ok(params == null, "null passed as 2nd param to loadURL");
+            t.ok(caller == tile, "tile passed as 3rd param to loadURL");
+            t.ok(onComplete == g_Success, "success param from loadFeaturesForRegion() passed as 4th param to loadURL");
+        };
+        
+      //no running request -- 4 tests
+        OpenLayers.Tile.WFS.prototype.loadFeaturesForRegion.apply(tile, [g_Success]);
+
+      //running request (cancelled) -- 4 tests + 1 test (for request abort)
+        tile.request = {
+            'transport': {
+                'abort': function() {
+                    t.ok(true, "request aborted");
+                }
+            }
+        };
+        OpenLayers.Tile.WFS.prototype.loadFeaturesForRegion.apply(tile, [g_Success]);
+                
+        OpenLayers.loadURL = tLoadURL;
+    }
+    
-    function test_Tile_WFS_destroy(t) {
-        t.plan(8);
-

lib/OpenLayers/Tile/WFS.js

@@ -108 +108 @@
-    * failure - {function}
-    */
-    loadFeaturesForRegion:function(success, failure) {
+        if(this.request) {
+            this.request.transport.abort();
+            //this.request.destroy();
+        }
-        this.request = OpenLayers.loadURL(this.url, null, this, success);
-    },
-