Skip to content

Commit

Permalink
Fixes #11426: getting the responseText of an xhr should be tried/caug…
Browse files Browse the repository at this point in the history
…ht because of IE's inability to give access to binary data. Unit test added.
  • Loading branch information
jaubourg committed Mar 7, 2012
1 parent 014b2a5 commit 484cea1
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/ajax/xhr.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,13 @@ if ( jQuery.support.ajax ) {
if ( xml && xml.documentElement /* #4958 */ ) {
responses.xml = xml;
}
responses.text = xhr.responseText;

// When requesting binary data, IE6-9 will throw an exception
// on any attempt to access responseText (#11426)
try {
responses.text = xhr.responseText;
} catch( _ ) {
}

// Firefox throws an exception when accessing
// statusText for faulty cross-domain requests
Expand Down
Binary file added test/data/1x1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions test/unit/ajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -2322,6 +2322,20 @@ test("jQuery.ajax - abort in prefilter", function() {

});

test( "jQuery.ajax - loading binary data shouldn't throw an exception in IE (#11426)", 1, function() {
stop();
jQuery.ajax( url( "data/1x1.jpg" ), {
success: function( data ) {
ok( data === undefined || /JFIF/.test( data ) , "success callback reached" );
start();
},
error: function( _, __, error ) {
ok( false, "exception thrown: '" + error + "'" );
start();
}
});
});

test("jQuery.ajax - active counter", function() {
ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
});
Expand Down

0 comments on commit 484cea1

Please sign in to comment.