github-migration
/
vendor-all-the-javascripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:johnbintz/vendor-all-the-javascripts

This commit is contained in:
John Bintz 2012-07-02 18:32:50 -04:00
parent 80989e3aeb 3289a91a84
commit 5112684efb
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/assets/javascripts/ajaxfileupload.js vendored
View File

@ -101,6 +101,12 @@ jQuery.extend({
if ( status != "error" ) if ( status != "error" )
{ {
// process the data (runs the xml through httpData regardless of callback) // process the data (runs the xml through httpData regardless of callback)
if ($('pre', xml.responseText)) {
var $doc = $("<div />").append(xml.responseText);
xml = { responseText: $doc.find('pre').get(0).innerHTML};
}
var data = jQuery.uploadHttpData( xml, s.dataType ); var data = jQuery.uploadHttpData( xml, s.dataType );
// If a local callback was specified, fire it and pass it the data // If a local callback was specified, fire it and pass it the data
if ( s.success ) if ( s.success )