Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-23 13:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3234 from nkholski/master

Browse source 
load.plugin now accepts class as an argument besides an url-string
This commit is contained in:
Richard Davey 2018-02-28 20:50:32 +00:00 committed by GitHub
commit de9cfb6ee2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
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
else if (typeof(this.url) !== 'function')
{
this.url = GetFastValue(fileConfig, 'path', '').concat(this.url);
}
@ -118,7 +118,7 @@ var File = new Class({
* @type {integer}
* @since 3.0.0
*/
this.state = CONST.FILE_PENDING;
this.state = typeof(this.url) === "function" ? CONST.FILE_POPULATED : CONST.FILE_PENDING;
/**
* The total size of this file.

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

@ -34,6 +34,14 @@ 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 = {