turn download class into a function

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
nextcloud · Mar 31, 2021 · 7c33107 · 7c33107
1 parent 3d96fb3
commit 7c33107
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 27 deletions.
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
@@ -380,7 +380,7 @@
 					}
 				};
 
-			OCA.Files.Download.get(files, dir, randomToken);
+			OCA.Files.download(files, dir, randomToken);
 			OC.Util.waitFor(checkForDownloadCookie, 500);
 		}
 	};

diff --git a/apps/files/src/download.js b/apps/files/src/download.js
@@ -20,10 +20,9 @@
  *
  */
 
-import Download from './services/Download'
+import download from './services/Download'
 
-// Init Sidebar Service
 if (!window.OCA.Files) {
 	window.OCA.Files = {}
 }
-Object.assign(window.OCA.Files, { Download: new Download() })
+Object.assign(window.OCA.Files, { download })
diff --git a/apps/files/src/services/Download.js b/apps/files/src/services/Download.js
@@ -23,27 +23,21 @@
 import { generateUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
 
-export default class Download {
-
-	export
-	const
-	get(files, dir, downloadStartSecret) {
-		axios.post(
-			generateUrl('apps/files/registerDownload'),
-			{
-				files,
-				dir,
-				downloadStartSecret,
-			}
-		).then(res => {
-			if (res.status === 200 && res.data.token) {
-				const dlUrl = generateUrl(
-					'apps/files/ajax/download.php?token={token}',
-					{ token: res.data.token }
-				)
-				OC.redirect(dlUrl)
-			}
-		})
-	}
-
+export default function(files, dir, downloadStartSecret) {
+	axios.post(
+		generateUrl('apps/files/registerDownload'),
+		{
+			files,
+			dir,
+			downloadStartSecret,
+		}
+	).then(res => {
+		if (res.status === 200 && res.data.token) {
+			const dlUrl = generateUrl(
+				'apps/files/ajax/download.php?token={token}',
+				{ token: res.data.token }
+			)
+			OC.redirect(dlUrl)
+		}
+	})
 }
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
@@ -295,6 +295,20 @@ OCA.Sharing.PublicApp = {
 			$('#download').click(function (e) {
 				e.preventDefault();
 				OC.redirect(FileList.getDownloadUrl());
+
+				var path = dir || this.getCurrentDirectory();
+				if (_.isArray(filename)) {
+					filename = JSON.stringify(filename);
+				}
+				var params = {
+					path: path
+				};
+				if (filename) {
+					params.files = filename;
+				}
+
+
+				OCA.Files.Download.get()
 			});
 
 			if (hideDownload === 'true') {
-Original file line number
+Diff line change
@@ Expand Up / @@ -380,7 +380,7 @@ @@
     					}
     				};
-    			OCA.Files.Download.get(files, dir, randomToken);
+    			OCA.Files.download(files, dir, randomToken);
     			OC.Util.waitFor(checkForDownloadCookie, 500);
     		}
     	};
@@ Expand Down @@