Merge pull request phaserjs#3091 from Twilrom/bugfixes

Bugfixes

Author: photonstorm

v3/src/events/EventDispatcher.js

@@ -212,7 +212,7 @@ var EventDispatcher = new Class({
     {
         for (var binding in this.bindings)
         {
-            binding.destroy();
+            this.bindings[binding].destroy();
         }
 
         this.bindings = {};

v3/src/loader/File.js

@@ -174,17 +174,17 @@ var File = new Class({
  */
 File.createObjectURL = function (image, blob, defaultType)
 {
-    if(URL)
+    if (typeof URL === 'function')
     {
         image.src = URL.createObjectURL(blob);
     }
     else
     {
         var reader = new FileReader();
 
-        reader.onload = function()
+        reader.onload = function ()
         {
-            delete image.crossOrigin;
+            image.removeAttribute('crossOrigin');
             image.src = 'data:' + (blob.type || defaultType) + ';base64,' + reader.result.split(',')[1];
         };
 

v3/src/scene/plugins/DataStore.js

@@ -77,18 +77,18 @@ var DataStore = new Class({
         return data.after(key, callback, scope);
     },
 
-    each: function (gameObject, callback, scope, args)
+    each: function (gameObject, callback, scope)
     {
         var data = this.getData(gameObject);
 
         return data.each(callback, scope);
     },
 
-    merge: function (gameObject, data, overwrite)
+    merge: function (gameObject, _data, overwrite)
     {
         var data = this.getData(gameObject);
 
-        return data.merge(data, overwrite);
+        return data.merge(_data, overwrite);
     },
 
     remove: function (gameObject, key)

v3/src/utils/Class.js

@@ -8,7 +8,7 @@ function hasGetterOrSetter (def)
 function getProperty (definition, k, isClassDescriptor)
 {
     //  This may be a lightweight object, OR it might be a property that was defined previously.
-    
+
     //  For simple class descriptors we can just assume its NOT previously defined.
     var def = (isClassDescriptor) ? definition[k] : Object.getOwnPropertyDescriptor(definition, k);
 
@@ -74,7 +74,7 @@ function extend (ctor, definition, isClassDescriptor, extend)
         if (def !== false)
         {
             //  If Extends is used, we will check its prototype to see if the final variable exists.
-            
+
             var parent = extend || ctor;
 
             if (hasNonConfigurable(parent.prototype, k))
@@ -136,7 +136,7 @@ function mixin (myClass, mixins)
  * @example
  *
  *      var MyClass = new Phaser.Class({
- *      
+ *
  *          initialize: function() {
  *              this.foo = 2.0;
  *          },
@@ -171,21 +171,18 @@ function Class (definition)
         //  here since we only call this on class creation (i.e. not object creation).
         delete definition.initialize;
     }
-    else
+    else if (definition.Extends)
     {
-        if (definition.Extends)
-        {
-            var base = definition.Extends;
+        var base = definition.Extends;
 
-            initialize = function ()
-            {
-                base.apply(this, arguments);
-            };
-        }
-        else
+        initialize = function ()
         {
-            initialize = function () {};
-        }
+            base.apply(this, arguments);
+        };
+    }
+    else
+    {
+        initialize = function () {};
     }
 
     if (definition.Extends)