From 6d15a2fce3ba8e0585b5b6df45d1a274daf76a46 Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lea@markedspartner.no>
Date: Thu, 17 Sep 2020 11:32:52 +0200
Subject: [PATCH 1/2] Eliminates error/no-preview when grid media picker have
 no crop set (#8620)

(cherry picked from commit deb03e4d82e48674c6d8bdc7926e820e17454d9e)
---
 .../mediapicker/overlays/mediacropdetails.controller.js      | 5 +++++
 .../mediapicker/overlays/mediacropdetails.html               | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js
index d9ea5a7a09..030200e1e6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.controller.js
+++ b/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;
+            }
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html
index 3814ac851e..cda42043c1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/overlays/mediacropdetails.html
+++ b/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>

From 6b0539fefcf2f7e103a38638c0328f2a418cb520 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 17 Sep 2020 12:19:07 +0200
Subject: [PATCH 2/2] Set version to RC

---
 src/SolutionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 3f512bc65a..26496aa9e6 100644
--- a/src/SolutionInfo.cs
+++ b/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")]