summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-06-25 17:40:11 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-06-25 17:40:11 +0000
commit99e8c2c67da4ded34c565cc9e9119d38c38a5eda (patch)
tree84a21a6c547370717d3e00e9784a350dec95e2d2
parent0b90147d04ac14e00f1b2109c382d55d310aceb0 (diff)
downloadredmine-99e8c2c67da4ded34c565cc9e9119d38c38a5eda.tar.gz
redmine-99e8c2c67da4ded34c565cc9e9119d38c38a5eda.zip
Merged r13184 from trunk to 2.5-stable (#13932)
Fix file upload does not work with Safari. Contributed by Felix Schäfer. git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13187 e93f8b46-1217-0410-a6f0-8f06a7374b81
-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 ab9f89a56..a689c2ef3 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -117,7 +117,7 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
function addInputFiles(inputEl) {
var clearedFileInput = $(inputEl).clone().val('');
- if (inputEl.files) {
+ if ('FileReader' in window && inputEl.files) {
// upload files using ajax
uploadAndAttachFiles(inputEl.files, inputEl);
$(inputEl).remove();