diff --git a/docs/api/loaders/JSONLoader.html b/docs/api/loaders/JSONLoader.html
index e2ec37695e0bdb041810917b6f478aa161641998..0ede083c0f28221a1e544349d70b627ec8d32def 100644
--- a/docs/api/loaders/JSONLoader.html
+++ b/docs/api/loaders/JSONLoader.html
@@ -16,27 +16,33 @@
Constructor
- [name]()
+ [name]( [page:LoadingManager manager] )
+
+ [page:LoadingManager manager] — The [page:LoadingManager loadingManager] for the loader to use. Default is [page:LoadingManager THREE.DefaultLoadingManager].
+
Creates a new [name].
+ Methods
- Properties
-
- [property:boolean withCredentials]
+ [method:null load]( [page:String url], [page:Function onLoad], [page:Function onProgress], [page:Function onError] )
- If true, the ajax request will use cookies.
+ [page:String url] — required.
+ [page:Function onLoad] — Will be called when load completes. The argument will be the loaded text response.
+ [page:Function onProgress] — Will be called while load progresses. The argument will be the XmlHttpRequest instance, that contain .[page:Integer total] and .[page:Integer loaded] bytes.
+ [page:Function onError] — Will be called when load errors.
+
+
+ Begin loading from url and pass the JSON to onLoad.
-
- Methods
-
- [method:null load]( [page:String url], [page:Function callback], [page:String texturePath] )
+ [method:null setTexturePath]( [page:String texturePath] )
+
+ [page:String texturePath] — Base path for textures.
+
- [page:String url] — required
- [page:Function callback] — required. Will be called when load completes. The arguments will be the loaded [page:Object3D] and the loaded [page:Array materials].
- [page:String texturePath] — optional. If not specified, textures will be assumed to be in the same folder as the Javascript model file.
+ Set the base path for textures.
[method:Object3D parse]( [page:Object json], [page:String texturePath] )
@@ -45,10 +51,9 @@
[page:String texturePath] — Base path for textures.
- Parse a JSON structure and return an [page:Object] containing the parsed .[page:Geometry] and .[page:Array materials].
+ Parse a JSON structure and return an [page:object] containing the parsed [page:Geometry geometry] and [page:Array materials].
-
Example
diff --git a/src/loaders/JSONLoader.js b/src/loaders/JSONLoader.js
index e8728264c9804b2a48a43f4fa37b1b8954b602c1..6d5b7d4ecb100ebb3459331490a9a4018e94012d 100644
--- a/src/loaders/JSONLoader.js
+++ b/src/loaders/JSONLoader.js
@@ -399,7 +399,7 @@ THREE.JSONLoader.prototype = {
}
- };
+ }
function parseSkin() {
@@ -444,7 +444,7 @@ THREE.JSONLoader.prototype = {
}
- };
+ }
function parseMorphing( scale ) {
@@ -536,7 +536,7 @@ THREE.JSONLoader.prototype = {
if ( outputAnimations.length > 0 ) geometry.animations = outputAnimations;
- };
+ }
if ( json.materials === undefined || json.materials.length === 0 ) {