Skip to content

Commit ae1b5a6

Browse files
committed
Loader Types
1 parent 53ac066 commit ae1b5a6

37 files changed

Lines changed: 113 additions & 113 deletions

src/loader/File.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var XHRSettings = require('./XHRSettings');
2424
* @since 3.0.0
2525
*
2626
* @param {Phaser.Loader.LoaderPlugin} loader - The Loader that is going to load this File.
27-
* @param {Phaser.Loader.Types.FileConfig} fileConfig - The file configuration object, as created by the file type.
27+
* @param {Phaser.Types.Loader.FileConfig} fileConfig - The file configuration object, as created by the file type.
2828
*/
2929
var File = new Class({
3030

@@ -113,7 +113,7 @@ var File = new Class({
113113
* The merged XHRSettings for this file.
114114
*
115115
* @name Phaser.Loader.File#xhrSettings
116-
* @type {Phaser.Loader.Types.XHRSettingsObject}
116+
* @type {Phaser.Types.Loader.XHRSettingsObject}
117117
* @since 3.0.0
118118
*/
119119
this.xhrSettings = XHRSettings(GetFastValue(fileConfig, 'responseType', undefined));

src/loader/LoaderPlugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ var LoaderPlugin = new Class({
186186
* xhr specific global settings (can be overridden on a per-file basis)
187187
*
188188
* @name Phaser.Loader.LoaderPlugin#xhr
189-
* @type {Phaser.Loader.Types.XHRSettingsObject}
189+
* @type {Phaser.Types.Loader.XHRSettingsObject}
190190
* @since 3.0.0
191191
*/
192192
this.xhr = XHRSettings(

src/loader/MergeXHRSettings.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ var XHRSettings = require('./XHRSettings');
1616
* @function Phaser.Loader.MergeXHRSettings
1717
* @since 3.0.0
1818
*
19-
* @param {Phaser.Loader.Types.XHRSettingsObject} global - The global XHRSettings object.
20-
* @param {Phaser.Loader.Types.XHRSettingsObject} local - The local XHRSettings object.
19+
* @param {Phaser.Types.Loader.XHRSettingsObject} global - The global XHRSettings object.
20+
* @param {Phaser.Types.Loader.XHRSettingsObject} local - The local XHRSettings object.
2121
*
22-
* @return {Phaser.Loader.Types.XHRSettingsObject} A newly formed XHRSettings object.
22+
* @return {Phaser.Types.Loader.XHRSettingsObject} A newly formed XHRSettings object.
2323
*/
2424
var MergeXHRSettings = function (global, local)
2525
{

src/loader/XHRLoader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var MergeXHRSettings = require('./MergeXHRSettings');
1515
* @since 3.0.0
1616
*
1717
* @param {Phaser.Loader.File} file - The File to download.
18-
* @param {Phaser.Loader.Types.XHRSettingsObject} globalXHRSettings - The global XHRSettings object.
18+
* @param {Phaser.Types.Loader.XHRSettingsObject} globalXHRSettings - The global XHRSettings object.
1919
*
2020
* @return {XMLHttpRequest} The XHR object.
2121
*/

src/loader/XHRSettings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @param {string} [password=''] - Optional password for the XHR request.
1717
* @param {integer} [timeout=0] - Optional XHR timeout value.
1818
*
19-
* @return {Phaser.Loader.Types.XHRSettingsObject} The XHRSettings object as used by the Loader.
19+
* @return {Phaser.Types.Loader.XHRSettingsObject} The XHRSettings object as used by the Loader.
2020
*/
2121
var XHRSettings = function (responseType, async, user, password, timeout)
2222
{

src/loader/filetypes/AnimationJSONFile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var LoaderEvents = require('../events');
2626
* @param {Phaser.Loader.LoaderPlugin} loader - A reference to the Loader that is responsible for this file.
2727
* @param {(string|Phaser.Loader.FileTypes.JSONFileConfig)} key - The key to use for this file, or a file configuration object.
2828
* @param {string} [url] - The absolute or relative URL to load this file from. If undefined or `null` it will be set to `<key>.json`, i.e. if `key` was "alien" then the URL will be "alien.json".
29-
* @param {Phaser.Loader.Types.XHRSettingsObject} [xhrSettings] - Extra XHR Settings specifically for this file.
29+
* @param {Phaser.Types.Loader.XHRSettingsObject} [xhrSettings] - Extra XHR Settings specifically for this file.
3030
* @param {string} [dataKey] - When the JSON file loads only this property will be stored in the Cache.
3131
*/
3232
var AnimationJSONFile = new Class({
@@ -169,7 +169,7 @@ var AnimationJSONFile = new Class({
169169
* @param {(string|Phaser.Loader.FileTypes.JSONFileConfig|Phaser.Loader.FileTypes.JSONFileConfig[])} key - The key to use for this file, or a file configuration object, or array of them.
170170
* @param {string} [url] - The absolute or relative URL to load this file from. If undefined or `null` it will be set to `<key>.json`, i.e. if `key` was "alien" then the URL will be "alien.json".
171171
* @param {string} [dataKey] - When the Animation JSON file loads only this property will be stored in the Cache and used to create animation data.
172-
* @param {Phaser.Loader.Types.XHRSettingsObject} [xhrSettings] - An XHR Settings configuration object. Used in replacement of the Loaders default XHR Settings.
172+
* @param {Phaser.Types.Loader.XHRSettingsObject} [xhrSettings] - An XHR Settings configuration object. Used in replacement of the Loaders default XHR Settings.
173173
*
174174
* @return {Phaser.Loader.LoaderPlugin} The Loader instance.
175175
*/

src/loader/filetypes/AtlasJSONFile.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ var MultiFile = require('../MultiFile.js');
1818
* @property {string} key - The key of the file. Must be unique within both the Loader and the Texture Manager.
1919
* @property {string} [textureURL] - The absolute or relative URL to load the texture image file from.
2020
* @property {string} [textureExtension='png'] - The default file extension to use for the image texture if no url is provided.
21-
* @property {Phaser.Loader.Types.XHRSettingsObject} [textureXhrSettings] - Extra XHR Settings specifically for the texture image file.
21+
* @property {Phaser.Types.Loader.XHRSettingsObject} [textureXhrSettings] - Extra XHR Settings specifically for the texture image file.
2222
* @property {string} [normalMap] - The filename of an associated normal map. It uses the same path and url to load as the texture image.
2323
* @property {string} [atlasURL] - The absolute or relative URL to load the atlas json file from. Or a well formed JSON object to use instead.
2424
* @property {string} [atlasExtension='json'] - The default file extension to use for the atlas json if no url is provided.
25-
* @property {Phaser.Loader.Types.XHRSettingsObject} [atlasXhrSettings] - Extra XHR Settings specifically for the atlas json file.
25+
* @property {Phaser.Types.Loader.XHRSettingsObject} [atlasXhrSettings] - Extra XHR Settings specifically for the atlas json file.
2626
*/
2727

2828
/**
@@ -45,8 +45,8 @@ var MultiFile = require('../MultiFile.js');
4545
* @param {(string|Phaser.Loader.FileTypes.AtlasJSONFileConfig)} key - The key to use for this file, or a file configuration object.
4646
* @param {string|string[]} [textureURL] - The absolute or relative URL to load the texture image file from. If undefined or `null` it will be set to `<key>.png`, i.e. if `key` was "alien" then the URL will be "alien.png".
4747
* @param {string} [atlasURL] - The absolute or relative URL to load the texture atlas json data file from. If undefined or `null` it will be set to `<key>.json`, i.e. if `key` was "alien" then the URL will be "alien.json".
48-
* @param {Phaser.Loader.Types.XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the atlas image file. Used in replacement of the Loaders default XHR Settings.
49-
* @param {Phaser.Loader.Types.XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the atlas json file. Used in replacement of the Loaders default XHR Settings.
48+
* @param {Phaser.Types.Loader.XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the atlas image file. Used in replacement of the Loaders default XHR Settings.
49+
* @param {Phaser.Types.Loader.XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the atlas json file. Used in replacement of the Loaders default XHR Settings.
5050
*/
5151
var AtlasJSONFile = new Class({
5252

@@ -221,8 +221,8 @@ var AtlasJSONFile = new Class({
221221
* @param {(string|Phaser.Loader.FileTypes.AtlasJSONFileConfig|Phaser.Loader.FileTypes.AtlasJSONFileConfig[])} key - The key to use for this file, or a file configuration object, or array of them.
222222
* @param {string|string[]} [textureURL] - The absolute or relative URL to load the texture image file from. If undefined or `null` it will be set to `<key>.png`, i.e. if `key` was "alien" then the URL will be "alien.png".
223223
* @param {string} [atlasURL] - The absolute or relative URL to load the texture atlas json data file from. If undefined or `null` it will be set to `<key>.json`, i.e. if `key` was "alien" then the URL will be "alien.json".
224-
* @param {Phaser.Loader.Types.XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the atlas image file. Used in replacement of the Loaders default XHR Settings.
225-
* @param {Phaser.Loader.Types.XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the atlas json file. Used in replacement of the Loaders default XHR Settings.
224+
* @param {Phaser.Types.Loader.XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the atlas image file. Used in replacement of the Loaders default XHR Settings.
225+
* @param {Phaser.Types.Loader.XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the atlas json file. Used in replacement of the Loaders default XHR Settings.
226226
*
227227
* @return {Phaser.Loader.LoaderPlugin} The Loader instance.
228228
*/

src/loader/filetypes/AtlasXMLFile.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ var XMLFile = require('./XMLFile.js');
1818
* @property {string} key - The key of the file. Must be unique within both the Loader and the Texture Manager.
1919
* @property {string} [textureURL] - The absolute or relative URL to load the texture image file from.
2020
* @property {string} [textureExtension='png'] - The default file extension to use for the image texture if no url is provided.
21-
* @property {Phaser.Loader.Types.XHRSettingsObject} [textureXhrSettings] - Extra XHR Settings specifically for the texture image file.
21+
* @property {Phaser.Types.Loader.XHRSettingsObject} [textureXhrSettings] - Extra XHR Settings specifically for the texture image file.
2222
* @property {string} [normalMap] - The filename of an associated normal map. It uses the same path and url to load as the texture image.
2323
* @property {string} [atlasURL] - The absolute or relative URL to load the atlas xml file from.
2424
* @property {string} [atlasExtension='xml'] - The default file extension to use for the atlas xml if no url is provided.
25-
* @property {Phaser.Loader.Types.XHRSettingsObject} [atlasXhrSettings] - Extra XHR Settings specifically for the atlas xml file.
25+
* @property {Phaser.Types.Loader.XHRSettingsObject} [atlasXhrSettings] - Extra XHR Settings specifically for the atlas xml file.
2626
*/
2727

2828
/**
@@ -43,8 +43,8 @@ var XMLFile = require('./XMLFile.js');
4343
* @param {(string|Phaser.Loader.FileTypes.AtlasXMLFileConfig)} key - The key to use for this file, or a file configuration object.
4444
* @param {string|string[]} [textureURL] - The absolute or relative URL to load the texture image file from. If undefined or `null` it will be set to `<key>.png`, i.e. if `key` was "alien" then the URL will be "alien.png".
4545
* @param {string} [atlasURL] - The absolute or relative URL to load the texture atlas xml data file from. If undefined or `null` it will be set to `<key>.xml`, i.e. if `key` was "alien" then the URL will be "alien.xml".
46-
* @param {Phaser.Loader.Types.XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the atlas image file. Used in replacement of the Loaders default XHR Settings.
47-
* @param {Phaser.Loader.Types.XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the atlas xml file. Used in replacement of the Loaders default XHR Settings.
46+
* @param {Phaser.Types.Loader.XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the atlas image file. Used in replacement of the Loaders default XHR Settings.
47+
* @param {Phaser.Types.Loader.XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the atlas xml file. Used in replacement of the Loaders default XHR Settings.
4848
*/
4949
var AtlasXMLFile = new Class({
5050

@@ -215,8 +215,8 @@ var AtlasXMLFile = new Class({
215215
* @param {(string|Phaser.Loader.FileTypes.AtlasXMLFileConfig|Phaser.Loader.FileTypes.AtlasXMLFileConfig[])} key - The key to use for this file, or a file configuration object, or array of them.
216216
* @param {string|string[]} [textureURL] - The absolute or relative URL to load the texture image file from. If undefined or `null` it will be set to `<key>.png`, i.e. if `key` was "alien" then the URL will be "alien.png".
217217
* @param {string} [atlasURL] - The absolute or relative URL to load the texture atlas xml data file from. If undefined or `null` it will be set to `<key>.xml`, i.e. if `key` was "alien" then the URL will be "alien.xml".
218-
* @param {Phaser.Loader.Types.XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the atlas image file. Used in replacement of the Loaders default XHR Settings.
219-
* @param {Phaser.Loader.Types.XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the atlas xml file. Used in replacement of the Loaders default XHR Settings.
218+
* @param {Phaser.Types.Loader.XHRSettingsObject} [textureXhrSettings] - An XHR Settings configuration object for the atlas image file. Used in replacement of the Loaders default XHR Settings.
219+
* @param {Phaser.Types.Loader.XHRSettingsObject} [atlasXhrSettings] - An XHR Settings configuration object for the atlas xml file. Used in replacement of the Loaders default XHR Settings.
220220
*
221221
* @return {Phaser.Loader.LoaderPlugin} The Loader instance.
222222
*/

src/loader/filetypes/AudioFile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var IsPlainObject = require('../../utils/object/IsPlainObject');
1717
*
1818
* @property {string} key - The key of the file. Must be unique within the Loader and Audio Cache.
1919
* @property {string} [urlConfig] - The absolute or relative URL to load the file from.
20-
* @property {Phaser.Loader.Types.XHRSettingsObject} [xhrSettings] - Extra XHR Settings specifically for this file.
20+
* @property {Phaser.Types.Loader.XHRSettingsObject} [xhrSettings] - Extra XHR Settings specifically for this file.
2121
* @property {AudioContext} [audioContext] - The AudioContext this file will use to process itself.
2222
*/
2323

@@ -38,7 +38,7 @@ var IsPlainObject = require('../../utils/object/IsPlainObject');
3838
* @param {Phaser.Loader.LoaderPlugin} loader - A reference to the Loader that is responsible for this file.
3939
* @param {(string|Phaser.Loader.FileTypes.AudioFileConfig)} key - The key to use for this file, or a file configuration object.
4040
* @param {any} [urlConfig] - The absolute or relative URL to load this file from in a config object.
41-
* @param {Phaser.Loader.Types.XHRSettingsObject} [xhrSettings] - Extra XHR Settings specifically for this file.
41+
* @param {Phaser.Types.Loader.XHRSettingsObject} [xhrSettings] - Extra XHR Settings specifically for this file.
4242
* @param {AudioContext} [audioContext] - The AudioContext this file will use to process itself.
4343
*/
4444
var AudioFile = new Class({
@@ -227,7 +227,7 @@ AudioFile.getAudioURL = function (game, urls)
227227
* @param {(string|Phaser.Loader.FileTypes.AudioFileConfig|Phaser.Loader.FileTypes.AudioFileConfig[])} key - The key to use for this file, or a file configuration object, or array of them.
228228
* @param {(string|string[])} [urls] - The absolute or relative URL to load the audio files from.
229229
* @param {any} [config] - An object containing an `instances` property for HTML5Audio. Defaults to 1.
230-
* @param {Phaser.Loader.Types.XHRSettingsObject} [xhrSettings] - An XHR Settings configuration object. Used in replacement of the Loaders default XHR Settings.
230+
* @param {Phaser.Types.Loader.XHRSettingsObject} [xhrSettings] - An XHR Settings configuration object. Used in replacement of the Loaders default XHR Settings.
231231
*
232232
* @return {Phaser.Loader.LoaderPlugin} The Loader instance.
233233
*/

src/loader/filetypes/AudioSpriteFile.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ var MultiFile = require('../MultiFile.js');
1717
*
1818
* @property {string} key - The key of the file. Must be unique within both the Loader and the Audio Cache.
1919
* @property {string} jsonURL - The absolute or relative URL to load the json file from. Or a well formed JSON object to use instead.
20-
* @property {Phaser.Loader.Types.XHRSettingsObject} [jsonXhrSettings] - Extra XHR Settings specifically for the json file.
20+
* @property {Phaser.Types.Loader.XHRSettingsObject} [jsonXhrSettings] - Extra XHR Settings specifically for the json file.
2121
* @property {{(string|string[])}} [audioURL] - The absolute or relative URL to load the audio file from.
2222
* @property {any} [audioConfig] - The audio configuration options.
23-
* @property {Phaser.Loader.Types.XHRSettingsObject} [audioXhrSettings] - Extra XHR Settings specifically for the audio file.
23+
* @property {Phaser.Types.Loader.XHRSettingsObject} [audioXhrSettings] - Extra XHR Settings specifically for the audio file.
2424
*/
2525

2626
/**
@@ -42,8 +42,8 @@ var MultiFile = require('../MultiFile.js');
4242
* @param {string} jsonURL - The absolute or relative URL to load the json file from. Or a well formed JSON object to use instead.
4343
* @param {{(string|string[])}} [audioURL] - The absolute or relative URL to load the audio file from. If empty it will be obtained by parsing the JSON file.
4444
* @param {any} [audioConfig] - The audio configuration options.
45-
* @param {Phaser.Loader.Types.XHRSettingsObject} [audioXhrSettings] - An XHR Settings configuration object for the audio file. Used in replacement of the Loaders default XHR Settings.
46-
* @param {Phaser.Loader.Types.XHRSettingsObject} [jsonXhrSettings] - An XHR Settings configuration object for the json file. Used in replacement of the Loaders default XHR Settings.
45+
* @param {Phaser.Types.Loader.XHRSettingsObject} [audioXhrSettings] - An XHR Settings configuration object for the audio file. Used in replacement of the Loaders default XHR Settings.
46+
* @param {Phaser.Types.Loader.XHRSettingsObject} [jsonXhrSettings] - An XHR Settings configuration object for the json file. Used in replacement of the Loaders default XHR Settings.
4747
*/
4848
var AudioSpriteFile = new Class({
4949

@@ -246,8 +246,8 @@ var AudioSpriteFile = new Class({
246246
* @param {string} jsonURL - The absolute or relative URL to load the json file from. Or a well formed JSON object to use instead.
247247
* @param {(string|string[])} [audioURL] - The absolute or relative URL to load the audio file from. If empty it will be obtained by parsing the JSON file.
248248
* @param {any} [audioConfig] - The audio configuration options.
249-
* @param {Phaser.Loader.Types.XHRSettingsObject} [audioXhrSettings] - An XHR Settings configuration object for the audio file. Used in replacement of the Loaders default XHR Settings.
250-
* @param {Phaser.Loader.Types.XHRSettingsObject} [jsonXhrSettings] - An XHR Settings configuration object for the json file. Used in replacement of the Loaders default XHR Settings.
249+
* @param {Phaser.Types.Loader.XHRSettingsObject} [audioXhrSettings] - An XHR Settings configuration object for the audio file. Used in replacement of the Loaders default XHR Settings.
250+
* @param {Phaser.Types.Loader.XHRSettingsObject} [jsonXhrSettings] - An XHR Settings configuration object for the json file. Used in replacement of the Loaders default XHR Settings.
251251
*
252252
* @return {Phaser.Loader.LoaderPlugin} The Loader.
253253
*/

0 commit comments

Comments
 (0)