Skip to content

Commit 122640e

Browse files
committed
Phaser.Loader was incorrectly getting the responseText from _xhr instead of _ajax on IE9 xDomainRequests (thanks @lardratboy phaserjs#1050)
1 parent 671c8e6 commit 122640e

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ Version 2.1.0 - "Cairhien" - -in development-
5555

5656
### Bug Fixes
5757

58+
* Remove escaping backslashes from RetroFont text set documentation (thanks @jackrugile #1051)
59+
* Phaser.Loader was incorrectly getting the responseText from _xhr instead of _ajax on IE9 xDomainRequests (thanks @lardratboy #1050)
60+
5861

5962
### Migration Guide
6063

src/loader/Loader.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,15 @@ Phaser.Loader.prototype = {
15211521
}
15221522

15231523
var file = this._fileList[index];
1524-
var data = JSON.parse(this._xhr.responseText);
1524+
1525+
if (this._ajax && this._ajax.responseText)
1526+
{
1527+
var data = JSON.parse(this._ajax.responseText);
1528+
}
1529+
else
1530+
{
1531+
var data = JSON.parse(this._xhr.responseText);
1532+
}
15251533

15261534
file.loaded = true;
15271535

0 commit comments

Comments
 (0)