Merging Loader into BaseLoader

Author: photonstorm

src/loader/BaseLoader.js

@@ -4,6 +4,8 @@ var CustomSet = require('../structs/Set');
 var EventEmitter = require('eventemitter3');
 var ParseXMLBitmapFont = require('../gameobjects/bitmaptext/ParseXMLBitmapFont');
 var XHRSettings = require('./XHRSettings');
+var FileTypesManager = require('./FileTypesManager');
+var PluginManager = require('../plugins/PluginManager');
 
 //  Phaser.Loader.BaseLoader
 
@@ -23,6 +25,18 @@ var BaseLoader = new Class({
 
         this.scene = scene;
 
+        this.systems = scene.sys;
+
+        if (!scene.sys.settings.isBooted)
+        {
+            scene.sys.events.once('boot', this.boot, this);
+        }
+
+        this._multilist = {};
+
+        //  Inject the available filetypes into the Loader
+        FileTypesManager.install(this);
+
         //  Move to a 'setURL' method?
         this.baseURL = '';
         this.path = '';
@@ -45,6 +59,14 @@ var BaseLoader = new Class({
         this.state = CONST.LOADER_IDLE;
     },
 
+    boot: function ()
+    {
+        var eventEmitter = this.systems.events;
+
+        eventEmitter.on('shutdown', this.shutdown, this);
+        eventEmitter.on('destroy', this.destroy, this);
+    },
+
     setPath: function (path)
     {
         if (path.substr(-1) !== '/')
@@ -514,4 +536,6 @@ var BaseLoader = new Class({
 
 });
 
+PluginManager.register('Loader', Loader, 'load');
+
 module.exports = BaseLoader;