colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug/gif-image-740' of git://github.com/Abijeet/BookStack 

Also removed console.logs in dropzone.js
This commit is contained in:
Dan Brown 2018-03-24 14:54:50 +00:00
parent 9fead9890b 2cfcbe0a3c
commit 5ad9c5d319
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Services/ImageService.php
View File

@ -170,6 +170,15 @@ class ImageService extends UploadService
return $image->path; return $image->path;
} }
/**
* Checks if the image is a gif. Returns true if it is, else false.
* @param Image $image
* @return boolean
*/
protected function isGif(Image $image) {
return strtolower(pathinfo($this->getPath($image), PATHINFO_EXTENSION)) === 'gif';
}
/** /**
* Get the thumbnail for an image. * Get the thumbnail for an image.
* If $keepRatio is true only the width will be used. * If $keepRatio is true only the width will be used.
@ -184,6 +193,10 @@ class ImageService extends UploadService
*/ */
public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false) public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
{ {
if ($keepRatio && $this->isGif($image)) {
return $this->getPublicUrl($this->getPath($image));
}
$thumbDirName = '/' . ($keepRatio ? 'scaled-' : 'thumbs-') . $width . '-' . $height . '/'; $thumbDirName = '/' . ($keepRatio ? 'scaled-' : 'thumbs-') . $width . '-' . $height . '/';
$imagePath = $this->getPath($image); $imagePath = $this->getPath($image);
$thumbFilePath = dirname($imagePath) . $thumbDirName . basename($imagePath); $thumbFilePath = dirname($imagePath) . $thumbDirName . basename($imagePath);

6
resources/assets/js/vues/components/dropzone.js
View File

@ -37,14 +37,14 @@ function mounted() {
dz.on('error', function (file, errorMessage, xhr) { dz.on('error', function (file, errorMessage, xhr) {
_this.$emit('error', {file, errorMessage, xhr}); _this.$emit('error', {file, errorMessage, xhr});
console.log(errorMessage);
console.log(xhr);
function setMessage(message) { function setMessage(message) {
$(file.previewElement).find('[data-dz-errormessage]').text(message); $(file.previewElement).find('[data-dz-errormessage]').text(message);
} }
if (xhr && xhr.status === 413) setMessage(trans('errors.server_upload_limit')); if (xhr && xhr.status === 413) setMessage(trans('errors.server_upload_limit'));
if (errorMessage.file) setMessage(errorMessage.file[0]); else if (errorMessage.file) setMessage(errorMessage.file);
}); });
} }
}); });