From d207be56bc83a81aa87ae6aa1ef94b5bf542e42d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= <ysq9207@126.com>
Date: Mon, 8 Jul 2019 13:16:01 +0800
Subject: [PATCH] update upload link&add safair support (#3812)

* update upload link&add safair support

* update seafile-js version
---
 frontend/package-lock.json                             | 6 +++---
 frontend/package.json                                  | 2 +-
 frontend/src/components/file-uploader/file-uploader.js | 6 +++---
 frontend/src/utils/utils.js                            | 3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 96014429e6..32f15a6051 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -13360,9 +13360,9 @@
       }
     },
     "seafile-js": {
-      "version": "0.2.104",
-      "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.104.tgz",
-      "integrity": "sha512-KtNamxIi9YIyPqalau7yQcAbuFOskLLm+hwR9cLSEtspxDGDlyGEO2J8+MOlonJB++PY5eV6iTX6ZSnh9t5rEg==",
+      "version": "0.2.105",
+      "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.105.tgz",
+      "integrity": "sha512-J79Nqwx/QuvM75leYWVupCJOPiJxIDZMLU7hAwz8I6eJ5/Gh6LbGglalYSfjlWjCKnxqeKNlrtomKdbG0z1oNQ==",
       "requires": {
         "axios": "^0.18.0",
         "form-data": "^2.3.2",
diff --git a/frontend/package.json b/frontend/package.json
index bc04ee9b30..579601ad61 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -38,7 +38,7 @@
     "react-responsive": "^6.1.1",
     "react-select": "^2.4.1",
     "reactstrap": "^6.4.0",
-    "seafile-js": "^0.2.104",
+    "seafile-js": "^0.2.105",
     "socket.io-client": "^2.2.0",
     "sw-precache-webpack-plugin": "0.11.4",
     "unified": "^7.0.0",
diff --git a/frontend/src/components/file-uploader/file-uploader.js b/frontend/src/components/file-uploader/file-uploader.js
index 265d8dc080..ab6b980e47 100644
--- a/frontend/src/components/file-uploader/file-uploader.js
+++ b/frontend/src/components/file-uploader/file-uploader.js
@@ -418,7 +418,7 @@ class FileUploader extends React.Component {
     this.uploadInput.current.removeAttribute('webkitdirectory');
     let repoID = this.props.repoID;
     seafileAPI.getUploadLink(repoID, this.props.path).then(res => {
-      this.resumable.opts.target = res.data;
+      this.resumable.opts.target = res.data + '?ret-json=1';
       if (Utils.isIEBrower()) {
         this.uploadInput.current.click();
       }
@@ -432,7 +432,7 @@ class FileUploader extends React.Component {
     this.uploadInput.current.setAttribute('webkitdirectory', 'webkitdirectory');
     let repoID = this.props.repoID;
     seafileAPI.getUploadLink(repoID, this.props.path).then(res => {
-      this.resumable.opts.target = res.data;
+      this.resumable.opts.target = res.data + '?ret-json=1';
       if (Utils.isIEBrower()) {
         this.uploadInput.current.click();
       }
@@ -446,7 +446,7 @@ class FileUploader extends React.Component {
     let repoID = this.props.repoID;
     this.uploadInput.current.setAttribute('webkitdirectory', 'webkitdirectory');
     seafileAPI.getUploadLink(repoID, this.props.path).then(res => {
-      this.resumable.opts.target = res.data;
+      this.resumable.opts.target = res.data + '?ret-json=1';
     });
   }
 
diff --git a/frontend/src/utils/utils.js b/frontend/src/utils/utils.js
index 1fc09db32b..c672780604 100644
--- a/frontend/src/utils/utils.js
+++ b/frontend/src/utils/utils.js
@@ -240,7 +240,8 @@ export const Utils = {
 
   isSupportUploadFolder: function() {
     return navigator.userAgent.indexOf('Firefox')!=-1 ||
-      navigator.userAgent.indexOf('Chrome') > -1;
+      navigator.userAgent.indexOf('Chrome') > -1 || 
+      navigator.userAgent.indexOf("Safari") > -1;
   },
 
   isIEBrower: function() { // is ie <= ie11 not include Edge