diff --git a/docs/api/loaders/Cache.html b/docs/api/loaders/Cache.html index 1a5843fd6ba31d34787dc75b057314bcabab1b83..dc4f6abbdb8837d024e56e1a7158b7744a6d46fe 100644 --- a/docs/api/loaders/Cache.html +++ b/docs/api/loaders/Cache.html @@ -10,7 +10,7 @@

[name]

-
A simple caching classe, used internaly by [page:XHRLoader].
+
A simple caching classe, used internaly by [page:FileLoader].

Constructor

diff --git a/docs/api/loaders/XHRLoader.html b/docs/api/loaders/FileLoader.html similarity index 100% rename from docs/api/loaders/XHRLoader.html rename to docs/api/loaders/FileLoader.html diff --git a/docs/list.js b/docs/list.js index c0521d4519a58c856d36bfd21d9bb6bcd64787dd..e423b1812db06c27997581d42da85ff1ef73665e 100644 --- a/docs/list.js +++ b/docs/list.js @@ -96,6 +96,7 @@ var list = { [ "BufferGeometryLoader", "api/loaders/BufferGeometryLoader" ], [ "Cache", "api/loaders/Cache" ], [ "ColladaLoader", "api/loaders/ColladaLoader" ], + [ "FileLoader", "api/loaders/FileLoader" ], [ "GLTFLoader", "api/loaders/GLTFLoader" ], [ "ImageLoader", "api/loaders/ImageLoader" ], [ "JSONLoader", "api/loaders/JSONLoader" ], @@ -108,8 +109,7 @@ var list = { [ "PDBLoader", "api/loaders/PDBLoader" ], [ "SVGLoader", "api/loaders/SVGLoader" ], [ "TextureLoader", "api/loaders/TextureLoader" ], - [ "TGALoader", "api/loaders/TGALoader" ], - [ "XHRLoader", "api/loaders/XHRLoader" ] + [ "TGALoader", "api/loaders/TGALoader" ] ], "Materials": [ diff --git a/editor/index.html b/editor/index.html index 3a95de312d852f7c57fc7674ed583ebae44aa44b..e9cb25f7bf210a7ef38ad89e960614dc8808f85e 100644 --- a/editor/index.html +++ b/editor/index.html @@ -365,7 +365,7 @@ if ( confirm( 'Any unsaved data will be lost. Are you sure?' ) ) { - var loader = new THREE.XHRLoader(); + var loader = new THREE.FileLoader(); loader.crossOrigin = ''; loader.load( file, function ( text ) { diff --git a/editor/js/Menubar.Examples.js b/editor/js/Menubar.Examples.js index 0edc43bfd48f6e97bc2c2c3e64e6721b4c713b7d..3ad787b4a66e9b3c304a411d8ae494963a4c75c5 100644 --- a/editor/js/Menubar.Examples.js +++ b/editor/js/Menubar.Examples.js @@ -25,7 +25,7 @@ Menubar.Examples = function ( editor ) { { title: 'Pong', file: 'pong.app.json' } ]; - var loader = new THREE.XHRLoader(); + var loader = new THREE.FileLoader(); for ( var i = 0; i < items.length; i ++ ) { diff --git a/editor/js/Menubar.File.js b/editor/js/Menubar.File.js index 6b2cbe7c21de64eac8ed17da22e042cc0bae72da..a0599ac776eaefade4465a653edc863ba9ec5320 100644 --- a/editor/js/Menubar.File.js +++ b/editor/js/Menubar.File.js @@ -233,7 +233,7 @@ Menubar.File = function ( editor ) { } ); - var loader = new THREE.XHRLoader( manager ); + var loader = new THREE.FileLoader( manager ); loader.load( 'js/libs/app/index.html', function ( content ) { var includes = []; diff --git a/editor/js/libs/app/index.html b/editor/js/libs/app/index.html index 98d594d5c75d259198dacbd63adf25b4f2df2590..b78a83f5e5d7821629578b2751a795f31b99e284 100644 --- a/editor/js/libs/app/index.html +++ b/editor/js/libs/app/index.html @@ -33,7 +33,7 @@