From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 25 Jun 2014 17:40:11 +0000 (+0000)
Subject: Merged r13184 from trunk to 2.5-stable (#13932)
X-Git-Tag: 2.5.2~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=99e8c2c67da4ded34c565cc9e9119d38c38a5eda;p=redmine.git

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
---

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();