diff --git a/static/js/pandora.js b/static/js/pandora.js index e29daf0..466fded 100644 --- a/static/js/pandora.js +++ b/static/js/pandora.js @@ -32,6 +32,7 @@ Ox.load('UI', { requests: {}, ui: {} }); + loadResources('/static/json/pandora.json', function() { Ox.print('Ox.App load', data); @@ -121,10 +122,10 @@ Ox.load('UI', { return; } var dfd = new $.Deferred(); + promises.push(dfd.promise()); Ox.loadFile(prefix + file, function() { dfd.resolve(); }); - promises.push(dfd.promise()); }); $.when.apply(null, promises) .done(function() { diff --git a/static/js/pandora/ui/player.js b/static/js/pandora/ui/player.js deleted file mode 100644 index e69de29..0000000 diff --git a/static/json/pandora.json b/static/json/pandora.json index 7d94568..756e9f7 100644 --- a/static/json/pandora.json +++ b/static/json/pandora.json @@ -11,7 +11,6 @@ "js/pandora/ui/group.js", "js/pandora/ui/toolbar.js", "js/pandora/ui/statusbar.js", - "js/pandora/ui/player.js", "js/pandora/ui/sectionButtons.js", "js/pandora/ui/item.js", "js/pandora/ui/folderBrowser.js",