minor adjustments for PR #23

psolom · Aug 7, 2016 · 66d9692 · 66d9692
1 parent 723a709
commit 66d9692
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/connectors/php/LocalFilemanager.php b/connectors/php/LocalFilemanager.php
@@ -826,11 +826,11 @@ protected function has_system_permission($filepath, $permissions)
 		return true;
 	}
 
-  /**
-   * Create array with file properties
-   * @param string $relative_path
- 	 * @return array|void
-   */
+	/**
+	 * Create array with file properties
+	 * @param string $relative_path
+	 * @return array
+	 */
 	protected function get_file_info($relative_path)
     {
 		$current_path = $this->getFullPath($relative_path);
@@ -1271,10 +1271,10 @@ protected function get_thumbnail($path)
 
 	/**
 	 * Creates thumbnail from the original image
-	 * @param $thumbPath
+	 * @param $imagePath
 	 * @param $thumbnailPath
 	 */
-	protected function createThumbnail($thumbPath, $thumbnailPath)
+	protected function createThumbnail($imagePath, $thumbnailPath)
 	{
 		if($this->config['images']['thumbnail']['enabled'] === true) {
 			$this->__log('generating thumbnail "' . $thumbnailPath . '"');
@@ -1285,9 +1285,9 @@ protected function createThumbnail($thumbPath, $thumbnailPath)
 			}
 
 			$this->initUploader(array(
-				'upload_dir' => dirname($thumbPath) . '/',
-			))->create_thumbnail_image($thumbPath);
+				'upload_dir' => dirname($imagePath) . '/',
+			))->create_thumbnail_image($imagePath);
 		}
 	}
 
-}
+}
diff --git a/scripts/filemanager.js b/scripts/filemanager.js
@@ -1851,10 +1851,11 @@ var getFileInfo = function(file) {
 		// add the new markup to the DOM
 		getSectionContainer($fileinfo).html(template);
 
+		// if file is an image we display the preview
+		var previewPath = isImageFile(data['Filename']) ? data['Preview'] : data['Thumbnail'];
+		$fileinfo.find('img').attr('src', createPreviewUrl(previewPath));
 		$fileinfo.find('#main-title > h1').text(data['Filename']).attr('title', file);
 
-		// if file is an image we display the preview
-		$fileinfo.find('img').attr('src', isImageFile(data['Filename']) ? createPreviewUrl(data['Preview']) : createPreviewUrl(data['Thumbnail']));
 		if(isVideoFile(data['Filename']) && config.videos.showVideoPlayer == true) {
 			getVideoPlayer(data);
 		}
@@ -2896,4 +2897,4 @@ if (!window.location.origin) {
 
 $(window).load(function() {
     $('#fileinfo').css({'left':$('#splitter .vsplitbar').width() + $('#filetree').width()});
-});
+});