Merge pull request phaserjs#3625 from iamchristopher/fix-json-loader

photonstorm · web-flow · commit f289be6bc712 · 2018-04-27T13:00:46.000+01:00
Fixed loader isn't passed to JSONFile
diff --git a/src/loader/filetypes/JSONFile.js b/src/loader/filetypes/JSONFile.js
@@ -96,12 +96,12 @@ FileTypesManager.register('json', function (key, url, xhrSettings)
         for (var i = 0; i < key.length; i++)
         {
             //  If it's an array it has to be an array of Objects, so we get everything out of the 'key' object
-            this.addFile(new JSONFile(key[i], url, this.path, xhrSettings));
+            this.addFile(new JSONFile(this, key[i], url, xhrSettings));
         }
     }
     else
     {
-        this.addFile(new JSONFile(key, url, this.path, xhrSettings));
+        this.addFile(new JSONFile(this, key, url, xhrSettings));
     }
 
     //  For method chaining

Original file line number	Diff line number	Diff line change
`@@ -96,12 +96,12 @@ FileTypesManager.register('json', function (key, url, xhrSettings)`
`96`	`96`	`for (var i = 0; i < key.length; i++)`
`97`	`97`	`{`
`98`	`98`	`// If it's an array it has to be an array of Objects, so we get everything out of the 'key' object`
`99`		`- this.addFile(new JSONFile(key[i], url, this.path, xhrSettings));`
	`99`	`+ this.addFile(new JSONFile(this, key[i], url, xhrSettings));`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`else`
`103`	`103`	`{`
`104`		`- this.addFile(new JSONFile(key, url, this.path, xhrSettings));`
	`104`	`+ this.addFile(new JSONFile(this, key, url, xhrSettings));`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`// For method chaining`