merge master into mobile-style

1 files changed, 7 insertions, 9 deletions

diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 730649c6378..c1b7eee3fb7 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -25,18 +25,16 @@ $(document).ready(function() {
 				window.location = $(tr).find('a.name').attr('href');
 			}
 		});
-		FileActions.register('file', 'Download', OC.PERMISSION_READ, '', function(filename) {
-			var tr = FileList.findFileEl(filename);
-			if (tr.length > 0) {
-				window.location = $(tr).find('a.name').attr('href');
-			}
-		});
-		FileActions.register('dir', 'Download', OC.PERMISSION_READ, '', function(filename) {
+
+		// override since the format is different
+		FileList.getDownloadUrl = function(filename, dir) {
+			// we use this because we need the service and token attributes
 			var tr = FileList.findFileEl(filename);
 			if (tr.length > 0) {
-				window.location = $(tr).find('a.name').attr('href')+'&download';
+				return $(tr).find('a.name').attr('href') + '&download';
 			}
-		});
+			return null;
+		};
 	}
 
 	var file_upload_start = $('#file_upload_start');