Added in destroy methods for all managers and invoked them from Game

Author: photonstorm

src/animations/AnimationManager.js

@@ -84,6 +84,8 @@ var AnimationManager = new Class({
     boot: function ()
     {
         this.textureManager = this.game.textures;
+
+        this.game.events.once('destroy', this.destroy, this);
     },
 
     /**
@@ -551,7 +553,11 @@ var AnimationManager = new Class({
      */
     destroy: function ()
     {
-        //  TODO
+        this.anims.clear();
+
+        this.textureManager = null;
+
+        this.game = null;
     }
 
 });

src/boot/Game.js

@@ -1,10 +1,11 @@
 var AddToDOM = require('../dom/AddToDOM');
 var AnimationManager = require('../animations/AnimationManager');
 var CacheManager = require('../cache/CacheManager');
+var CanvasPool = require('../display/canvas/CanvasPool');
 var Class = require('../utils/Class');
 var Config = require('./Config');
 var CreateRenderer = require('./CreateRenderer');
-var Data = require('../data/DataManager');
+var DataManager = require('../data/DataManager');
 var DebugHeader = require('./DebugHeader');
 var Device = require('../device');
 var DOMContentLoaded = require('../dom/DOMContentLoaded');
@@ -133,10 +134,10 @@ var Game = new Class({
         /**
          * [description]
          *
-         * @property {Phaser.Data} registry
+         * @property {Phaser.Data.DataManager} registry
          * @since 3.0.0
          */
-        this.registry = new Data(this);
+        this.registry = new DataManager(this);
 
         /**
          * An instance of the Input Manager.
@@ -212,9 +213,6 @@ var Game = new Class({
 
         //  Wait for the DOM Ready event, then call boot.
         DOMContentLoaded(this.boot.bind(this));
-
-        //  For debugging only
-        window.game = this;
     },
 
     /**
@@ -425,9 +423,24 @@ var Game = new Class({
      * @method Phaser.Game#destroy
      * @since 3.0.0
      */
-    destroy: function ()
+    destroy: function (removeCanvas)
     {
-        //  TODO
+        this.loop.destroy();
+
+        this.scene.destroy();
+
+        this.renderer.destroy();
+
+        this.events.emit('destroy');
+
+        this.events.removeAllListeners();
+
+        this.onStepCallback = null;
+
+        if (removeCanvas)
+        {
+            CanvasPool.remove(this.canvas);
+        }
     }
 
 });

src/boot/TimeStep.js

@@ -598,7 +598,8 @@ var TimeStep = new Class({
     {
         this.stop();
 
-        this.callback = null;
+        this.callback = NOOP;
+
         this.raf = null;
         this.game = null;
     }

src/cache/CacheManager.js

@@ -131,6 +131,8 @@ var CacheManager = new Class({
          * @since 3.0.0
          */
         this.custom = {};
+
+        this.game.events.once('destroy', this.destroy, this);
     },
 
     /**

src/data/DataManager.js

@@ -27,6 +27,8 @@ var DataManager = new Class({
         this.blockSet = false;
 
         this._frozen = false;
+
+        this.events.once('destroy', this.destroy, this);
     },
 
     //  Retrieves the value for the given key, or undefined if it doesn't exist.

src/dom/DOMContentLoaded.js

@@ -1,39 +1,26 @@
 var OS = require('../device/OS');
 
-var isBooted = false;
-
 /**
  * Inspects the readyState of the document. If the document is already complete then it invokes the given callback.
  * If not complete it sets up several event listeners such as `deviceready`, and once those fire, it invokes the callback.
- * Called automatically by the Phaser.Game instance. Should not usually be access directly.
+ * Called automatically by the Phaser.Game instance. Should not usually be accessed directly.
  *
  * @function Phaser.Dom.DOMContentLoaded
  * @since 3.0.0
  *
  * @param {function} callback - The callback to be invoked when the device is ready and the DOM content is loaded.
- *
- * @return {boolean} Returns `false` if the document is already loaded, otherwise `true` if the callback is pending.
  */
 var DOMContentLoaded = function (callback)
 {
-    if (isBooted)
-    {
-        return false;
-    }
-
     if (document.readyState === 'complete' || document.readyState === 'interactive')
     {
-        isBooted = true;
-        
         callback();
 
-        return true;
+        return;
     }
 
     var check = function ()
     {
-        isBooted = true;
-
         document.removeEventListener('deviceready', check, true);
         document.removeEventListener('DOMContentLoaded', check, true);
         window.removeEventListener('load', check, true);
@@ -55,8 +42,6 @@ var DOMContentLoaded = function (callback)
         document.addEventListener('DOMContentLoaded', check, true);
         window.addEventListener('load', check, true);
     }
-    
-    return true;
 };
 
 module.exports = DOMContentLoaded;

src/input/InputManager.js

@@ -193,6 +193,8 @@ var InputManager = new Class({
         this.mouse.boot();
         this.touch.boot();
         this.gamepad.boot();
+
+        this.game.events.once('destroy', this.destroy, this);
     },
 
     /**
@@ -500,6 +502,28 @@ var InputManager = new Class({
     getScaleY: function ()
     {
         return this.game.config.height / this.bounds.height;
+    },
+
+    /**
+     * [description]
+     *
+     * @method Phaser.Input.InputManager#destroy
+     * @since 3.0.0
+     */
+    destroy: function ()
+    {
+        this.events.removeAllListeners();
+
+        this.keyboard.destroy();
+        this.mouse.destroy();
+        this.touch.destroy();
+        this.gamepad.destroy();
+
+        this.activePointer.destroy();
+
+        this.queue = [];
+
+        this.game = null;
     }
 
 });

src/input/Pointer.js

@@ -584,6 +584,19 @@ var Pointer = new Class({
     forwardButtonDown: function ()
     {
         return (this.buttons & 16);
+    },
+
+    /**
+     * [description]
+     *
+     * @method Phaser.Input.Pointer#destroy
+     * @since 3.0.0
+     */
+    destroy: function ()
+    {
+        this.camera = null;
+        this.manager = null;
+        this.position = null;
     }
 
 });

src/input/gamepad/GamepadManager.js

@@ -339,6 +339,20 @@ var GamepadManager = new Class({
         }
     },
 
+    /**
+     * [description]
+     *
+     * @method Phaser.Input.Gamepad.GamepadManager#destroy
+     * @since 3.0.0
+     */
+    destroy: function ()
+    {
+        this.stopListeners();
+        this.disconnectAll();
+
+        this.gamepads = [];
+    },
+
     /**
      * The total number of connected game pads.
      * 

src/input/keyboard/KeyboardManager.js

@@ -402,6 +402,8 @@ var KeyboardManager = new Class({
         this.captures = [];
         this.queue = [];
         this.handler = undefined;
+
+        this.manager = null;
     }
 
 });