Fix types on Data

Author: orblazer

src/data/DataManager.js

@@ -18,7 +18,7 @@ var Class = require('../utils/Class');
  * @since 3.0.0
  *
  * @param {any} parent - [description]
- * @param {any} eventEmitter - [description]
+ * @param {EventEmitter} eventEmitter - [description]
  */
 var DataManager = new Class({
 
@@ -53,7 +53,7 @@ var DataManager = new Class({
          * [description]
          *
          * @name Phaser.Data.DataManager#list
-         * @type {object}
+         * @type {Object.<string, any>}
          * @default {}
          * @since 3.0.0
          */
@@ -126,15 +126,15 @@ var DataManager = new Class({
      *
      * @param {string} search - [description]
      *
-     * @return {object} [description]
+     * @return {Object.<string, any>} [description]
      */
     query: function (search)
     {
         var results = {};
 
         for (var key in this.list)
         {
-            if (key.match(search))
+            if (this.list.hasOwnProperty(key) && key.match(search))
             {
                 results[key] = this.list[key];
             }
@@ -228,7 +228,7 @@ var DataManager = new Class({
      * @method Phaser.Data.DataManager#merge
      * @since 3.0.0
      *
-     * @param {object} data - [description]
+     * @param {Object.<string, any>} data - [description]
      * @param {boolean} overwrite - [description]
      *
      * @return {Phaser.Data.DataManager} This DataManager object.
@@ -240,7 +240,7 @@ var DataManager = new Class({
         //  Merge data from another component into this one
         for (var key in data)
         {
-            if (overwrite || (!overwrite && !this.has(key)))
+            if (data.hasOwnProperty(key) && (overwrite || (!overwrite && !this.has(key))))
             {
                 this.list[key] = data[key];
             }
@@ -336,7 +336,7 @@ var DataManager = new Class({
      *
      * @method Phaser.Data.DataManager#reset
      * @since 3.0.0
-     * 
+     *
      * @return {Phaser.Data.DataManager} This DataManager object.
      */
     reset: function ()