Merge pull request #120 from owncloud/ignore_tiff_stable7v7.0.6RC2v7.0.6RC1v7.0.6v7.0.5v7.0.4RC2v7.0.4

ignore tiff

1 files changed, 4 insertions, 0 deletions

diff --git a/js/slideshow.js b/js/slideshow.js
index eaf2b9f8..e3a3ea14 100644
--- a/js/slideshow.js
+++ b/js/slideshow.js
@@ -371,6 +371,9 @@ $(document).ready(function () {
 			for (var i = 0; i < files.length; i++) {
 				var file = files[i];
 				if (file.mimetype && file.mimetype.indexOf('image') >= 0) {
+					if (file.mimetype === 'image/tiff') {
+						continue;
+					}
 					if (file.mimetype === 'image/svg+xml') {
 						imageUrl = OCA.Files.Files.getDownloadUrl(file.name, dir);
 					} else {
@@ -406,5 +409,6 @@ $(document).ready(function () {
 			jQuery.fn.slideShow.call(images, $('#slideshow'), start, {fallBacks: fallBacks});
 		});
 		OCA.Files.fileActions.setDefault('image', 'View');
+		OCA.Files.fileActions.setDefault('image/tiff', 'Download');
 	}
 });