From b3f2fdc567786ba126c3d760829b173020ddf9e4 Mon Sep 17 00:00:00 2001 From: Tapio Vierros Date: Mon, 24 Sep 2012 21:58:03 +0300 Subject: [PATCH] Fix collada loader when examples are viewed through server. The following examples where broken on mrdoob.github.com and when viewed through a local python web server. file:// worked. webgl_loader_collada.html webgl_loader_collada_keyframe.html webgl_loader_json_blender.html --- examples/js/loaders/ColladaLoader.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/examples/js/loaders/ColladaLoader.js b/examples/js/loaders/ColladaLoader.js index 64bc1277c9..4a5cdc5057 100644 --- a/examples/js/loaders/ColladaLoader.js +++ b/examples/js/loaders/ColladaLoader.js @@ -74,6 +74,13 @@ THREE.ColladaLoader = function () { readyCallbackFunc = readyCallback; parse( request.responseXML, undefined, url ); + } else if ( request.responseText ) { + + readyCallbackFunc = readyCallback; + var xmlParser = new DOMParser(); + var responseXML = xmlParser.parseFromString( request.responseText, "application/xml" ); + parse( responseXML, undefined, url ); + } else { console.error( "ColladaLoader: Empty or non-existing file (" + url + ")" ); -- GitLab