From a945b0c511febd4617a6c9cbd327e9cca5d59069 Mon Sep 17 00:00:00 2001
From: Nathan Woulfe <nathan@nathanw.com.au>
Date: Thu, 30 Jan 2020 02:52:20 +1000
Subject: [PATCH] use default color when previous selection removed (#7448)

Thanks Nathan!
---
 .../iconpicker/iconpicker.controller.js             | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
index 471d23ae84..5bfee22c4e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
@@ -16,7 +16,7 @@ function IconPickerController($scope, iconHelper, localizationService) {
     vm.close = close;
 
     vm.colors = [
-        { name: "Black", value: "color-black" },
+        { name: "Black", value: "color-black", default: true },
         { name: "Blue Grey", value: "color-blue-grey" },
         { name: "Grey", value: "color-grey" },
         { name: "Brown", value: "color-brown" },
@@ -49,7 +49,7 @@ function IconPickerController($scope, iconHelper, localizationService) {
         });
 
         // set a default color if nothing is passed in
-        vm.color = $scope.model.color ? findColor($scope.model.color) : vm.colors[0];
+        vm.color = $scope.model.color ? findColor($scope.model.color) : vm.colors.find(x => x.default);
 
         // if an icon is passed in - preselect it
         vm.icon = $scope.model.icon ? $scope.model.icon : undefined;
@@ -71,12 +71,13 @@ function IconPickerController($scope, iconHelper, localizationService) {
     }
 
     function findColor(value) {
-        return _.findWhere(vm.colors, {value: value});
+        return vm.colors.find(x => x.value === value);
     }
 
-    function selectColor(color, $index, $event) {
-        $scope.model.color = color.value;
-        vm.color = color;
+    function selectColor(color) {
+        let newColor = (color || vm.colors.find(x => x.default));
+        $scope.model.color = newColor.value;
+        vm.color = newColor;
     }
 
     function close() {