Permalink
Browse files

Merge branch 'master' into jquery-ui

  • Loading branch information...
2 parents 80cdbc2 + 8438d59 commit eaebc371843a71dd0e21310ec8d007c6ceb4ee1a @blueimp committed Aug 9, 2012
Showing with 6 additions and 2 deletions.
  1. +4 −1 js/jquery.fileupload.js
  2. +2 −1 js/jquery.iframe-transport.js
View
5 js/jquery.fileupload.js
@@ -1,5 +1,5 @@
/*
- * jQuery File Upload Plugin 5.13
+ * jQuery File Upload Plugin 5.14
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2010, Sebastian Tschan
@@ -447,6 +447,9 @@
if (options.type !== 'POST' && options.type !== 'PUT') {
options.type = 'POST';
}
+ if (!options.formAcceptCharset) {
+ options.formAcceptCharset = options.form.attr('accept-charset');
+ }
},
_getAJAXSettings: function (data) {
View
3 js/jquery.iframe-transport.js
@@ -1,5 +1,5 @@
/*
- * jQuery Iframe Transport Plugin 1.4
+ * jQuery Iframe Transport Plugin 1.5
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2011, Sebastian Tschan
@@ -42,6 +42,7 @@
return {
send: function (_, completeCallback) {
form = $('<form style="display:none;"></form>');
+ form.attr('accept-charset', options.formAcceptCharset);
// javascript:false as initial iframe src
// prevents warning popups on HTTPS in IE6.
// IE versions below IE8 cannot set the name property of

0 comments on commit eaebc37

Please sign in to comment.