Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-27 07:01:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Arcade groups collider

Browse source
This commit is contained in:
Niklas Berg 2018-02-24 00:02:19 +01:00
parent b9e4d15efb
commit 456faf400c
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/loader/File.js
View file

@ -65,7 +65,7 @@ var File = new Class({
{
this.url = GetFastValue(fileConfig, 'path', '') + this.key + '.' + GetFastValue(fileConfig, 'extension', '');
}
else if (typeof(this.url) !== 'function')
else
{
this.url = GetFastValue(fileConfig, 'path', '').concat(this.url);
}
@ -118,7 +118,7 @@ var File = new Class({
* @type {integer}
* @since 3.0.0
*/
this.state = typeof(this.url) === "function" ? CONST.FILE_POPULATED : CONST.FILE_PENDING;
this.state = CONST.FILE_PENDING;
/**
* The total size of this file.
@ -437,4 +437,4 @@ File.revokeObjectURL = function (image)
}
};
module.exports = File;
module.exports = File;

10
src/loader/filetypes/PluginFile.js
View file

@ -34,14 +34,6 @@ var PluginFile = new Class({
function PluginFile (key, url, path, xhrSettings)
{
// If the url variable refers to a class, add the plugin directly
if (typeof url === 'function')
{
this.key = key;
window[key] = url;
window[key].register(PluginManager);
}
var fileKey = (typeof key === 'string') ? key : GetFastValue(key, 'key', '');
var fileConfig = {
@ -115,4 +107,4 @@ FileTypesManager.register('plugin', function (key, url, xhrSettings)
return this;
});
module.exports = PluginFile;
module.exports = PluginFile;