aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/fileactions.js2
-rw-r--r--apps/files/js/files.js7
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);
}
};