diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-10-30 14:37:19 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-10-30 14:58:53 +0100 |
| commit | 80cf4e84e32f09838e9f9e362568f02642ef7658 (patch) | |
| tree | 3bcb07d844f1002b8027aa37f79db5f16ccf1643 /apps/files/js | |
| parent | 73d9699be9d2a343b0573dc6a5bcc65f5f9c7303 (diff) | |
| download | nextcloud-server-80cf4e84e32f09838e9f9e362568f02642ef7658.tar.gz nextcloud-server-80cf4e84e32f09838e9f9e362568f02642ef7658.zip | |
Fix file action download spinner
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/fileactions.js | 2 | ||||
| -rw-r--r-- | apps/files/js/files.js | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 079c5330ec2..6a767d48a28 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -589,7 +589,7 @@ context.fileList.showFileBusyState(filename, false); }; - context.fileList.showFileBusyState(downloadFileaction, true); + context.fileList.showFileBusyState(filename, true); OCA.Files.Files.handleDownload(url, disableLoadingState); } } diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 9ab7609cc40..ae38511ec05 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -295,7 +295,12 @@ } }; - OC.redirect(url + '&downloadStartSecret=' + randomToken); + if (url.indexOf('?') >= 0) { + url += '&'; + } else { + url += '?'; + } + OC.redirect(url + 'downloadStartSecret=' + randomToken); OC.Util.waitFor(checkForDownloadCookie, 500); } }; |