diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-02 10:13:58 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-11-02 10:13:58 +0100 |
| commit | 01adefaf509840cfa7212b654e69a1d291228a5e (patch) | |
| tree | 91375b98bd5dcaad9e199de55f89c55c37882928 /apps/files/js | |
| parent | b6ca23afe13304f904811d510a8e843a4ea832e9 (diff) | |
| parent | 80cf4e84e32f09838e9f9e362568f02642ef7658 (diff) | |
| download | nextcloud-server-01adefaf509840cfa7212b654e69a1d291228a5e.tar.gz nextcloud-server-01adefaf509840cfa7212b654e69a1d291228a5e.zip | |
Merge pull request #20181 from owncloud/files-fixdownloadspinner
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); } }; |