summaryrefslogtreecommitdiffstats
path: root/public
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-09-14 13:44:24 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-09-14 13:44:24 +0000
commit98589f0ecda40cf957d2d6fa62c9201737061d21 (patch)
tree7c8d730a942fe703490cd009fcbe165add5e5093 /public
parent5ccbe10d10208ee6ed68b792a782cdd5ebcd64ec (diff)
downloadredmine-98589f0ecda40cf957d2d6fa62c9201737061d21.tar.gz
redmine-98589f0ecda40cf957d2d6fa62c9201737061d21.zip
stricter check of uploading attachments (#17581)
Contributed by fred bregar. git-svn-id: http://svn.redmine.org/redmine/trunk@13404 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'public')
-rw-r--r--public/javascripts/attachments.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 229235f83..f80098665 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -119,7 +119,7 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
function addInputFiles(inputEl) {
var clearedFileInput = $(inputEl).clone().val('');
- if (inputEl.files) {
+ if ($.ajaxSettings.xhr().upload && inputEl.files) {
// upload files using ajax
uploadAndAttachFiles(inputEl.files, inputEl);
$(inputEl).remove();