From 745e009af3c9d4d203ee0be6fb3cff417923383d Mon Sep 17 00:00:00 2001 From: paulmasson Date: Tue, 9 May 2017 19:17:53 -0700 Subject: [PATCH] Typos and grammar --- docs/api/loaders/AnimationLoader.html | 2 +- docs/api/loaders/AudioLoader.html | 2 +- docs/api/loaders/BufferGeometryLoader.html | 2 +- docs/api/loaders/CompressedTextureLoader.html | 2 +- docs/api/loaders/CubeTextureLoader.html | 2 +- docs/api/loaders/DataTextureLoader.html | 2 +- docs/api/loaders/FileLoader.html | 6 +++--- docs/api/loaders/FontLoader.html | 2 +- docs/api/loaders/JSONLoader.html | 2 +- docs/api/loaders/ObjectLoader.html | 2 +- docs/api/loaders/TextureLoader.html | 2 +- docs/examples/loaders/BabylonLoader.html | 2 +- docs/examples/loaders/MTLLoader.html | 2 +- docs/examples/loaders/OBJLoader.html | 2 +- docs/examples/loaders/OBJLoader2.html | 2 +- docs/examples/loaders/PCDLoader.html | 2 +- docs/examples/loaders/PDBLoader.html | 2 +- docs/examples/loaders/SVGLoader.html | 2 +- docs/examples/loaders/TGALoader.html | 2 +- editor/js/libs/tern-threejs/threejs.js | 2 +- examples/js/loaders/OBJLoader2.js | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/api/loaders/AnimationLoader.html b/docs/api/loaders/AnimationLoader.html index d00e9e4506..c216aafbfd 100644 --- a/docs/api/loaders/AnimationLoader.html +++ b/docs/api/loaders/AnimationLoader.html @@ -63,7 +63,7 @@ [page:String url] — the path or URL to the file. This can also be a [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:Animation animation].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called if load errors.

Begin loading from url and pass the loaded animation to onLoad. diff --git a/docs/api/loaders/AudioLoader.html b/docs/api/loaders/AudioLoader.html index baa105108b..b95d453b6b 100644 --- a/docs/api/loaders/AudioLoader.html +++ b/docs/api/loaders/AudioLoader.html @@ -82,7 +82,7 @@ [page:String url] — the path or URL to the file. This can also be a [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].
[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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/api/loaders/BufferGeometryLoader.html b/docs/api/loaders/BufferGeometryLoader.html index 376f0d4251..5fba5d8eac 100644 --- a/docs/api/loaders/BufferGeometryLoader.html +++ b/docs/api/loaders/BufferGeometryLoader.html @@ -69,7 +69,7 @@ [page:String url] — the path or URL to the file. This can also be a [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].d
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:BufferGeometry].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/api/loaders/CompressedTextureLoader.html b/docs/api/loaders/CompressedTextureLoader.html index b8f8819cde..734b091471 100644 --- a/docs/api/loaders/CompressedTextureLoader.html +++ b/docs/api/loaders/CompressedTextureLoader.html @@ -53,7 +53,7 @@ [page:String url] — the path or URL to the file. This can also be a [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded texture.
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/api/loaders/CubeTextureLoader.html b/docs/api/loaders/CubeTextureLoader.html index 0c2ad83bd7..03aeede50a 100644 --- a/docs/api/loaders/CubeTextureLoader.html +++ b/docs/api/loaders/CubeTextureLoader.html @@ -76,7 +76,7 @@ scene.background = new THREE.CubeTextureLoader() [page:String urls] — array of 6 urls to images, one for each side of the CubeTexture. These can also be [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URIs].
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:Texture texture].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/api/loaders/DataTextureLoader.html b/docs/api/loaders/DataTextureLoader.html index 35ee9a4a2e..27247f5882 100644 --- a/docs/api/loaders/DataTextureLoader.html +++ b/docs/api/loaders/DataTextureLoader.html @@ -49,7 +49,7 @@ [page:String url] — the path or URL to the file. This can also be a [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded texture.
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/api/loaders/FileLoader.html b/docs/api/loaders/FileLoader.html index 9be41fbb86..28b92f0f2a 100644 --- a/docs/api/loaders/FileLoader.html +++ b/docs/api/loaders/FileLoader.html @@ -12,7 +12,7 @@

[name]

- A low level class for loading resources with XmlHttpRequest, used internaly by most loaders. + A low level class for loading resources with XMLHttpRequest, used internaly by most loaders. It can also be used directly to load any file type that does not have a loader.
@@ -100,8 +100,8 @@ loader.load( [page:String url] — the path or URL to the file. This can also be a [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].
[page:Function onLoad] — Will be called when loading completes. The argument will be the loaded response.
- [page:Function onProgress] — Will be called while load progresses. The argument will be the XmlHttpRequest instance, - that contains .[page:Integer total] and .[page:Integer loaded] bytes.
+ [page:Function onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, + which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called if an error occurs.

Load the URL and pass the response to the onLoad function. diff --git a/docs/api/loaders/FontLoader.html b/docs/api/loaders/FontLoader.html index b95e198209..852e898f3a 100644 --- a/docs/api/loaders/FontLoader.html +++ b/docs/api/loaders/FontLoader.html @@ -71,7 +71,7 @@ [page:String url] — the path or URL to the file. This can also be a [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:Texture texture].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.

Begin loading from url and pass the loaded [page:Texture texture] to onLoad. diff --git a/docs/api/loaders/JSONLoader.html b/docs/api/loaders/JSONLoader.html index 7dfcf2b424..f293736e55 100644 --- a/docs/api/loaders/JSONLoader.html +++ b/docs/api/loaders/JSONLoader.html @@ -74,7 +74,7 @@ [page:String url] — the path or URL to the file. This can also be a [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI]..
[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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/api/loaders/ObjectLoader.html b/docs/api/loaders/ObjectLoader.html index 55bbef6f7d..2e8ec17877 100644 --- a/docs/api/loaders/ObjectLoader.html +++ b/docs/api/loaders/ObjectLoader.html @@ -99,7 +99,7 @@ scene.add( object ); [page:String url] — the path or URL to the file. This can also be a [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:Object3D object].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/api/loaders/TextureLoader.html b/docs/api/loaders/TextureLoader.html index 1b7a783a29..983b482859 100644 --- a/docs/api/loaders/TextureLoader.html +++ b/docs/api/loaders/TextureLoader.html @@ -86,7 +86,7 @@ [page:String url] — the path or URL to the file. This can also be a [link:https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs Data URI].
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:Texture texture].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.

Begin loading from url and pass the loaded [page:Texture texture] to onLoad. diff --git a/docs/examples/loaders/BabylonLoader.html b/docs/examples/loaders/BabylonLoader.html index 03fd2df674..f13a33b2e2 100644 --- a/docs/examples/loaders/BabylonLoader.html +++ b/docs/examples/loaders/BabylonLoader.html @@ -59,7 +59,7 @@
[page:String url] — required
[page:function onLoad] — Will be called when load completes. The argument will be the loaded [page:Object3D].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:function onError] — Will be called when load errors.
diff --git a/docs/examples/loaders/MTLLoader.html b/docs/examples/loaders/MTLLoader.html index 6a0cc30953..d9da48745d 100644 --- a/docs/examples/loaders/MTLLoader.html +++ b/docs/examples/loaders/MTLLoader.html @@ -33,7 +33,7 @@
[page:String url] — required
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:MTLLoaderMaterialCreator MTLLoader.MaterialCreator] instance.
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/examples/loaders/OBJLoader.html b/docs/examples/loaders/OBJLoader.html index 1dd6c61fc8..21b2f438a7 100644 --- a/docs/examples/loaders/OBJLoader.html +++ b/docs/examples/loaders/OBJLoader.html @@ -53,7 +53,7 @@
[page:String url] — required
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:Object3D].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/examples/loaders/OBJLoader2.html b/docs/examples/loaders/OBJLoader2.html index e41bf812d5..15b77d9ee5 100644 --- a/docs/examples/loaders/OBJLoader2.html +++ b/docs/examples/loaders/OBJLoader2.html @@ -50,7 +50,7 @@
[page:String url] — URL of the file to load
[page:Function onLoad] — Called after loading was successfully completed. The argument will be the loaded [page:Object3D].
- [page:Function onProgress] — Called to report progress of loading. The argument will be the XmlHttpRequest instance, that contain .[page:Integer total] and .[page:Integer loaded] bytes.
+ [page:Function onProgress] — Called to report progress of loading. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] Called after an error occurred during loading.
[page:boolean useArrayBuffer] — Set this to false to force string based parsing
diff --git a/docs/examples/loaders/PCDLoader.html b/docs/examples/loaders/PCDLoader.html index 6690b174e5..4df1ad0d1f 100644 --- a/docs/examples/loaders/PCDLoader.html +++ b/docs/examples/loaders/PCDLoader.html @@ -58,7 +58,7 @@
[page:String url] — required
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:Object3D].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/examples/loaders/PDBLoader.html b/docs/examples/loaders/PDBLoader.html index 4b19bf1bb0..ebbd26f0c4 100644 --- a/docs/examples/loaders/PDBLoader.html +++ b/docs/examples/loaders/PDBLoader.html @@ -64,7 +64,7 @@
[page:String url] — required. URL to the .pdb file
[page:Function onLoad] — Will be called when load completes. The arguments will be an [page:BufferGeometry geometryAtoms], [page:BufferGeometry geometryBonds] and the [page:Object JSON] structure.
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/examples/loaders/SVGLoader.html b/docs/examples/loaders/SVGLoader.html index a04d574558..8a84e19a86 100644 --- a/docs/examples/loaders/SVGLoader.html +++ b/docs/examples/loaders/SVGLoader.html @@ -33,7 +33,7 @@
[page:String url] — required
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:SVGDocument].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/docs/examples/loaders/TGALoader.html b/docs/examples/loaders/TGALoader.html index 9e04ae8bab..8df6c504b5 100644 --- a/docs/examples/loaders/TGALoader.html +++ b/docs/examples/loaders/TGALoader.html @@ -62,7 +62,7 @@
[page:String url] — required
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded [page:DataTexture].
- [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 onProgress] — Will be called while load progresses. The argument will be the XMLHttpRequest instance, which contains .[page:Integer total] and .[page:Integer loaded] bytes.
[page:Function onError] — Will be called when load errors.
diff --git a/editor/js/libs/tern-threejs/threejs.js b/editor/js/libs/tern-threejs/threejs.js index ba5c4c4c70..a75a9c274c 100644 --- a/editor/js/libs/tern-threejs/threejs.js +++ b/editor/js/libs/tern-threejs/threejs.js @@ -2283,7 +2283,7 @@ "!doc": "[page:String value] — the empty string (default), \"arraybuffer\", \"blob\", \"document\", \"json\", or \"text\"." } }, - "!doc": "A low level class for loading resources with XmlHttpRequest, used internaly by most loaders.", + "!doc": "A low level class for loading resources with XMLHttpRequest, used internaly by most loaders.", "!type": "fn(manager: +THREE.LoadingManager)" }, "GLTFLoader": { diff --git a/examples/js/loaders/OBJLoader2.js b/examples/js/loaders/OBJLoader2.js index 2db5c398f2..f68d27c542 100644 --- a/examples/js/loaders/OBJLoader2.js +++ b/examples/js/loaders/OBJLoader2.js @@ -78,7 +78,7 @@ THREE.OBJLoader2 = (function () { * * @param {string} url URL of the file to load * @param {callback} onLoad Called after loading was successfully completed - * @param {callback} onProgress Called to report progress of loading. The argument will be the XmlHttpRequest instance, that contain {integer total} and {integer loaded} bytes. + * @param {callback} onProgress Called to report progress of loading. The argument will be the XMLHttpRequest instance, which contains {integer total} and {integer loaded} bytes. * @param {callback} onError Called after an error occurred during loading * @param {boolean} [useArrayBuffer=true] Set this to false to force string based parsing */ -- GitLab