Fixed custom JSON reading

ekelokorpi · Mar 5, 2014 · fb23d86 · fb23d86
1 parent b307987
commit fb23d86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/engine/core.js b/src/engine/core.js
@@ -52,6 +52,10 @@ var core = {
     version: '1.1.3',
     config: window.pandaConfig || {},
     plugins: {},
+    json: {},
+    getJSON: function(id) {
+        return this.json[this.assets[id]];
+    },
     /**
         Scale factor for Retina and HiRes mode.
         @property {Number} scale

diff --git a/src/engine/loader.js b/src/engine/loader.js
@@ -157,7 +157,8 @@ game.Loader = game.Class.extend({
         File loaded.
         @method progress
     **/
-    progress: function() {
+    progress: function(loader) {
+        if(loader.json && !loader.json.frames && !loader.json.bones) game.json[loader.url] = loader.json;
         this.loaded++;
         this.percent = Math.round(this.loaded / (this.assets.length + this.sounds.length) * 100);
         this.onPercentChange();