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

some stupid fixes

Browse Source
This commit is contained in:
John Bintz 2012-08-25 10:19:43 -04:00
parent 57bd303a54
commit eb1850d6cb
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
*.gem *.gem
.DS_Store
.bundle .bundle
Gemfile.lock Gemfile.lock
pkg/* pkg/*

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

@ -89,7 +89,7 @@ jQuery.extend({
xml.responseText = xml.responseText.replace(/^<pre>(.*)<\/pre>$/, '$1'); xml.responseText = xml.responseText.replace(/^<pre>(.*)<\/pre>$/, '$1');
}catch(e) }catch(e)
{ {
jQuery.handleError(s, xml, null, e); throw e;
} }
if ( xml || isTimeout == "timeout") if ( xml || isTimeout == "timeout")
{ {
@ -100,12 +100,6 @@ jQuery.extend({
// Make sure that the request was successful or notmodified // Make sure that the request was successful or notmodified
if ( status != "error" ) if ( status != "error" )
{ {
// 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
@ -115,12 +109,12 @@ jQuery.extend({
// Fire the global callback // Fire the global callback
if( s.global ) if( s.global )
jQuery.event.trigger( "ajaxSuccess", [xml, s] ); jQuery.event.trigger( "ajaxSuccess", [xml, s] );
} else } else {
jQuery.handleError(s, xml, status); if (s.error) { s.error(); }
}
} catch(e) } catch(e)
{ {
status = "error"; throw e;
jQuery.handleError(s, xml, status, e);
} }
// The request was completed // The request was completed
@ -181,7 +175,7 @@ jQuery.extend({
} catch(e) } catch(e)
{ {
jQuery.handleError(s, xml, null, e); //jQuery.handleError(s, xml, null, e);
} }
jQuery('#' + frameId).load(uploadCallback ); jQuery('#' + frameId).load(uploadCallback );