From ea77f37ef2f79e4217762f380cfffbd7a03dc03d Mon Sep 17 00:00:00 2001 From: Nibbler999 Date: Thu, 21 Mar 2013 15:16:47 +0100 Subject: [PATCH 1/2] Add mime type override to json request --- src/pixi/loaders/SpriteSheetLoader.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pixi/loaders/SpriteSheetLoader.js b/src/pixi/loaders/SpriteSheetLoader.js index 3fbf869..593ce41 100644 --- a/src/pixi/loaders/SpriteSheetLoader.js +++ b/src/pixi/loaders/SpriteSheetLoader.js @@ -46,6 +46,7 @@ PIXI.SpriteSheetLoader.prototype.load = function() } this.ajaxRequest.open("GET", this.url, true) + this.ajaxRequest.overrideMimeType("application/json"); this.ajaxRequest.send(null) } From 5066b10d41e3afd39a32cc3932d40ccb8aaee282 Mon Sep 17 00:00:00 2001 From: Nibbler999 Date: Thu, 21 Mar 2013 15:27:30 +0100 Subject: [PATCH 2/2] Check method exists before calling --- src/pixi/loaders/SpriteSheetLoader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pixi/loaders/SpriteSheetLoader.js b/src/pixi/loaders/SpriteSheetLoader.js index 593ce41..f2c97f6 100644 --- a/src/pixi/loaders/SpriteSheetLoader.js +++ b/src/pixi/loaders/SpriteSheetLoader.js @@ -46,7 +46,7 @@ PIXI.SpriteSheetLoader.prototype.load = function() } this.ajaxRequest.open("GET", this.url, true) - this.ajaxRequest.overrideMimeType("application/json"); + if (this.ajaxRequest.overrideMimeType) this.ajaxRequest.overrideMimeType("application/json"); this.ajaxRequest.send(null) }