Merge pull request #541 from owncloud/stable8.1-ask-for-preview-provider

[stable8.1] Load previews only for registered providers
owncloud-archive · Aug 31, 2015 · f31447e · f31447e
2 parents 399ef2c + 871f084
commit f31447e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/controller/documentcontroller.php b/controller/documentcontroller.php
@@ -150,7 +150,8 @@ public function listAll(){
 			} else {
 				$documents[$key] = $document;
 			}
-			$documents[$key]['icon'] = preg_replace('/\.png$/', '.svg', \OC_Helper::mimetypeIcon($document['mimetype']));
+			$documents[$key]['icon'] = preg_replace('/\.png$/', '.svg', \OCP\Template::mimetype_icon($document['mimetype']));
+			$documents[$key]['hasPreview'] = \OC::$server->getPreviewManager()->isMimeSupported($document['mimetype']);
 			$fileIds[] = $document['fileid'];
 		}
 

diff --git a/js/documents.js b/js/documents.js
@@ -61,7 +61,7 @@ $.widget('oc.documentGrid', {
 		previewURL = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
 		previewURL = previewURL.replace('(', '%28').replace(')', '%29');
 
-		if ( $('#previews_enabled').length ) {
+		if ( $('#previews_enabled').length && document.hasPreview) {
 			var img = new Image();
 			img.onload = function(){
 				var ready = function (node){