diff --git a/lib/OpenLayers/Ajax.js b/lib/OpenLayers/Ajax.js
index e31ef4b484..b87a717539 100644
--- a/lib/OpenLayers/Ajax.js
+++ b/lib/OpenLayers/Ajax.js
@@ -53,8 +53,8 @@ OpenLayers.nullHandler = function(request) {
* receive the request object as an argument.
*
* Returns:
- * {OpenLayers.Ajax.Request} The request object. To abort loading, call
- * request.transport.abort();
+ * {XMLHttpRequest} The request object. To abort loading, call
+ * request.abort().
*/
OpenLayers.loadURL = function(uri, params, caller,
onComplete, onFailure) {
@@ -66,7 +66,7 @@ OpenLayers.loadURL = function(uri, params, caller,
: OpenLayers.nullHandler;
// from prototype.js
- return new OpenLayers.Ajax.Request(
+ var request = new OpenLayers.Ajax.Request(
uri,
{
method: 'get',
@@ -75,6 +75,7 @@ OpenLayers.loadURL = function(uri, params, caller,
onFailure: failure
}
);
+ return request.transport;
};
/**
diff --git a/lib/OpenLayers/Tile/WFS.js b/lib/OpenLayers/Tile/WFS.js
index 67ed6d5a45..7b365ac859 100644
--- a/lib/OpenLayers/Tile/WFS.js
+++ b/lib/OpenLayers/Tile/WFS.js
@@ -66,7 +66,7 @@ OpenLayers.Tile.WFS = OpenLayers.Class(OpenLayers.Tile, {
this.features = null;
this.url = null;
if(this.request) {
- this.request.transport.abort();
+ this.request.abort();
//this.request.destroy();
this.request = null;
}
@@ -111,8 +111,7 @@ OpenLayers.Tile.WFS = OpenLayers.Class(OpenLayers.Tile, {
*/
loadFeaturesForRegion:function(success, failure) {
if(this.request) {
- this.request.transport.abort();
- //this.request.destroy();
+ this.request.abort();
}
this.request = OpenLayers.loadURL(this.url, null, this, success);
},
diff --git a/tests/Tile/test_WFS.html b/tests/Tile/test_WFS.html
index 3a1b64134b..15bb58cba3 100644
--- a/tests/Tile/test_WFS.html
+++ b/tests/Tile/test_WFS.html
@@ -72,10 +72,8 @@
//running request (cancelled) -- 4 tests + 1 test (for request abort)
tile.request = {
- transport: {
- 'abort': function() {
- t.ok(true, "request aborted");
- }
+ 'abort': function() {
+ t.ok(true, "request aborted");
}
};
OpenLayers.Tile.WFS.prototype.loadFeaturesForRegion.apply(tile, [g_Success]);
@@ -100,10 +98,8 @@
var _gAbort = false;
tile.request = {
- transport: {
- abort: function() {
- _gAbort = true;
- }
+ abort: function() {
+ _gAbort = true;
}
}
diff --git a/tests/manual/ajax.html b/tests/manual/ajax.html
index ca5742b904..145cfad464 100644
--- a/tests/manual/ajax.html
+++ b/tests/manual/ajax.html
@@ -1,6 +1,6 @@
- Draw Feature Acceptance Test
+ Ajax Acceptance Test