yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uses just the fix from #6414 - to show a preview of svg files after selection in the media picker

Browse Source
This commit is contained in:
Sebastiaan Janssen
2019-09-29 14:55:39 +02:00
parent e37434d816
commit df6e29a249
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
View File

@@ -143,23 +143,28 @@ function mediaHelper(umbRequestHelper, $log) {
*/
resolveFileFromEntity: function (mediaEntity, thumbnail) {
if (!angular.isObject(mediaEntity.metaData) || !mediaEntity.metaData.MediaPath) {
var mediaPath = angular.isObject(mediaEntity.metaData) ? mediaEntity.metaData.MediaPath : null;
if (!mediaPath) {
//don't throw since this image legitimately might not contain a media path, but output a warning
$log.warn("Cannot resolve the file url from the mediaEntity, it does not contain the required metaData");
return null;
}
if (thumbnail) {
if (this.detectIfImageByExtension(mediaEntity.metaData.MediaPath)) {
return this.getThumbnailFromPath(mediaEntity.metaData.MediaPath);
if (this.detectIfImageByExtension(mediaPath)) {
return this.getThumbnailFromPath(mediaPath);
}
else if (this.getFileExtension(mediaPath) === "svg") {
return this.getThumbnailFromPath(mediaPath);
}
else {
return null;
}
}
else {
return mediaEntity.metaData.MediaPath;
}
return mediaPath;
}
},
/**
@@ -294,6 +299,11 @@ function mediaHelper(umbRequestHelper, $log) {
*/
getThumbnailFromPath: function (imagePath) {
// Check if file is a svg
if (this.getFileExtension(imagePath) === "svg") {
return imagePath;
}
//If the path is not an image we cannot get a thumb
if (!this.detectIfImageByExtension(imagePath)) {
return null;