Merge pull request #407 from nextcloud/bkprt-public-share-linksv13.0.1RC1

[stable13] create "file app" public share links if the slideshow is opened from ...

2 files changed, 12 insertions, 2 deletions

diff --git a/js/galleryfileaction.js b/js/galleryfileaction.js
index c7aee2d2..d0c9a1b4 100644
--- a/js/galleryfileaction.js
+++ b/js/galleryfileaction.js
@@ -227,4 +227,9 @@ $(document).ready(function () {
 		window.galleryFileAction.buildFeaturesList(config.features);
 		window.galleryFileAction.register(config.mediatypes);
 	});
+
+	// create public share links as from the files app
+	if (!Gallery.appName) {
+		Gallery.appName = 'files';
+	}
 });
diff --git a/js/vendor/nextcloud/share.js b/js/vendor/nextcloud/share.js
index 85da3097..663205bd 100644
--- a/js/vendor/nextcloud/share.js
+++ b/js/vendor/nextcloud/share.js
@@ -587,8 +587,13 @@
 			$linkCheckbox.attr('data-id', id);
 			var $linkText = $('#linkText');
 
-			var link = parent.location.protocol + '//' + location.host +
-				OC.generateUrl('/apps/gallery/s/') + token;
+			if (Gallery.appName === 'files') {
+				var link = parent.location.protocol + '//' + location.host +
+					OC.generateUrl('/s/') + token;
+			} else {
+				var link = parent.location.protocol + '//' + location.host +
+					OC.generateUrl('/apps/gallery/s/') + token;
+			}
 
 			$linkText.val(link);
 			$linkText.slideDown(OC.menuSpeed);