Merge remote-tracking branch 'origin/v8/8.8' into v8/bug/8919-cache-icons-used-in-login-screen

src/SolutionInfo.cs

@@ -19,4 +19,4 @@ using System.Resources;
 
 // these are FYI and changed automatically
 [assembly: AssemblyFileVersion("8.8.0")]
-[assembly: AssemblyInformationalVersion("8.8.0")]
+[assembly: AssemblyInformationalVersion("8.8.0-rc")]

src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js

@@ -6,6 +6,7 @@
 
             vm.submit = submit;
             vm.close = close;
+            vm.cropSet = cropSet;
 
             if (!$scope.model.target.coordinates && !$scope.model.target.focalPoint) {
                 $scope.model.target.focalPoint = { left: .5, top: .5 };
@@ -56,4 +57,8 @@
                 }
             }
 
+            function cropSet() {
+                var model = $scope.model;
+                return (model.cropSize || {}).width && model.target.thumbnail;
+            }
         });

src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html

@@ -26,7 +26,7 @@
 
             <div class="umb-control-group" ng-if="model.target">
 
-                <div ng-if="model.disableFocalPoint && model.target.thumbnail">
+                <div ng-if="vm.cropSet() === false">
                     <h5>
                         <localize key="general_preview">Preview</localize>
                     </h5>
@@ -34,7 +34,7 @@
                     <img ng-src="{{model.target.thumbnail}}" alt="{{model.target.name}}" />
                 </div>
 
-                <div ng-if="!model.disableFocalPoint">
+                <div ng-if="vm.cropSet()">
                     <h5>
                         <localize key="@general_cropSection">Crop section</localize>
                     </h5>