From f07e0ccda6ee25126665143637b5d6bfe4d68c66 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 21 Mar 2008 17:34:27 +0000 Subject: [PATCH] Adding an extra check for IE, where request.responseXML is true on occasion even if the documentElement doesn't exist. r=crschmidt (closes #1428) git-svn-id: http://svn.openlayers.org/trunk/openlayers@6573 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Layer/GML.js | 2 +- lib/OpenLayers/Layer/GeoRSS.js | 4 ++-- lib/OpenLayers/Tile/WFS.js | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/OpenLayers/Layer/GML.js b/lib/OpenLayers/Layer/GML.js index 50d0069786..81776bbfcb 100644 --- a/lib/OpenLayers/Layer/GML.js +++ b/lib/OpenLayers/Layer/GML.js @@ -131,7 +131,7 @@ OpenLayers.Layer.GML = OpenLayers.Class(OpenLayers.Layer.Vector, { requestSuccess:function(request) { var doc = request.responseXML; - if (!doc) { + if (!doc || !doc.documentElement) { doc = request.responseText; } diff --git a/lib/OpenLayers/Layer/GeoRSS.js b/lib/OpenLayers/Layer/GeoRSS.js index d1421ae65c..8b12a62265 100644 --- a/lib/OpenLayers/Layer/GeoRSS.js +++ b/lib/OpenLayers/Layer/GeoRSS.js @@ -131,8 +131,8 @@ OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, { */ parseData: function(ajaxRequest) { var doc = ajaxRequest.responseXML; - if (!doc) { - doc = OpenLayers.parseXMLString(ajaxRequest.responseText); + if (!doc || !doc.documentElement) { + doc = OpenLayers.Format.XML.prototype.read(ajaxRequest.responseText); } if (this.useFeedTitle) { diff --git a/lib/OpenLayers/Tile/WFS.js b/lib/OpenLayers/Tile/WFS.js index c2288476ff..06345c29e7 100644 --- a/lib/OpenLayers/Tile/WFS.js +++ b/lib/OpenLayers/Tile/WFS.js @@ -127,9 +127,8 @@ OpenLayers.Tile.WFS = OpenLayers.Class(OpenLayers.Tile, { requestSuccess:function(request) { if (this.features) { var doc = request.responseXML; - - if (!doc) { - doc = OpenLayers.parseXMLString(request.responseText); + if (!doc || !doc.documentElement) { + doc = OpenLayers.Format.XML.prototype.read(request.responseText); } if (this.layer.vectorMode) { this.layer.addFeatures(this.layer.formatObject.read(doc));