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

Uploading SVG's Causes Error (Depending on imageFileTypes Setting) (#3072)

Browse Source
This commit is contained in:
imranhaidercogworks
2018-09-30 12:09:44 +01:00
committed by Sebastiaan Janssen
parent 6b398a2d16
commit 5f1fb144e0
18 changed files with 225 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
View File

@@ -31,10 +31,10 @@ angular.module("umbraco.directives")
//elements
var $viewport = element.find(".viewport");
var $image = element.find("img");
var $overlay = element.find(".overlay");
var $overlay = element.find(".overlay");
scope.style = function () {
if(scope.dimensions.width <= 0){
scope.style = function () {
if (scope.dimensions.width <= 0) {
setDimensions();
}
@@ -45,23 +45,29 @@ angular.module("umbraco.directives")
};
scope.setFocalPoint = function(event) {
scope.$emit("imageFocalPointStart");
scope.$emit("imageFocalPointStart");
var offsetX = event.offsetX - 10;
var offsetY = event.offsetY - 10;
var offsetX = event.offsetX - 10;
var offsetY = event.offsetY - 10;
calculateGravity(offsetX, offsetY);
lazyEndEvent();
calculateGravity(offsetX, offsetY);
lazyEndEvent();
};
var setDimensions = function(){
scope.dimensions.width = $image.width();
scope.dimensions.height = $image.height();
if(scope.center){
var setDimensions = function () {
if (scope.src.endsWith(".svg")) {
// svg files don't automatically get a size by
// loading them set a default size for now
$image.attr("width", "200");
$image.attr("height", "200");
// can't crop an svg file, don't show the focal point
$overlay.remove();
}
scope.dimensions.width = $image.width();
scope.dimensions.height = $image.height();
if(scope.center){
scope.dimensions.left = scope.center.left * scope.dimensions.width -10;
scope.dimensions.top = scope.center.top * scope.dimensions.height -10;
}else{

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
View File

@@ -46,8 +46,8 @@
</umb-image-gravity>
<a href class="btn btn-link btn-crop-delete" ng-click="clear()"><i class="icon-delete red"></i> <localize key="content_uploadClear">Remove file</localize></a>
</div>
<ul class="umb-sortable-thumbnails cropList clearfix">
<ul ng-if="!imageSrc.endsWith('.svg')" class="umb-sortable-thumbnails cropList clearfix">
<li ng-repeat=" (key,value) in model.value.crops" ng-class="{'current':currentCrop.alias === value.alias}" ng-click="crop(value)">
<umb-image-thumbnail center="model.value.focalPoint"