Merge pull request phaserjs#2526 from drhayes/dev

photonstorm · photonstorm · commit d81ec7fa0f86 · 2016-06-03T16:42:30.000+01:00
Don't extend Phaser.Utils when doing deep copy in Phaser.Cache.getJSON.
diff --git a/src/loader/Cache.js b/src/loader/Cache.js
@@ -454,10 +454,10 @@ Phaser.Cache.prototype = {
             font: null,
             base: new PIXI.BaseTexture(data)
         };
-        
+
         if (xSpacing === undefined) { xSpacing = 0; }
         if (ySpacing === undefined) { ySpacing = 0; }
-        
+
         if (atlasType === 'json')
         {
             obj.font = Phaser.LoaderParser.jsonBitmapFont(atlasData, obj.base, xSpacing, ySpacing);
@@ -1312,7 +1312,7 @@ Phaser.Cache.prototype = {
         {
             if (clone)
             {
-                return Phaser.Utils.extend(true, data);
+                return Phaser.Utils.extend(true, {}, data);
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -454,10 +454,10 @@ Phaser.Cache.prototype = {`
`454`	`454`	`font: null,`
`455`	`455`	`base: new PIXI.BaseTexture(data)`
`456`	`456`	`};`
`457`		`-`
	`457`	`+`
`458`	`458`	`if (xSpacing === undefined) { xSpacing = 0; }`
`459`	`459`	`if (ySpacing === undefined) { ySpacing = 0; }`
`460`		`-`
	`460`	`+`
`461`	`461`	`if (atlasType === 'json')`
`462`	`462`	`{`
`463`	`463`	`obj.font = Phaser.LoaderParser.jsonBitmapFont(atlasData, obj.base, xSpacing, ySpacing);`
`@@ -1312,7 +1312,7 @@ Phaser.Cache.prototype = {`
`1312`	`1312`	`{`
`1313`	`1313`	`if (clone)`
`1314`	`1314`	`{`
`1315`		`- return Phaser.Utils.extend(true, data);`
	`1315`	`+ return Phaser.Utils.extend(true, {}, data);`
`1316`	`1316`	`}`
`1317`	`1317`	`else`
`1318`	`1318`	`{`