From dbd74f5273c5b3c5047cfec96742c65c2e4473d4 Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Fri, 31 May 2019 16:15:20 +0200
Subject: [PATCH] v8: Fix listview layout icons (#5405)

---
 .../listview/layouts.prevalues.controller.js  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
index 9ba8822843..a02215f452 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.controller.js
@@ -29,12 +29,6 @@
       vm.removeLayout = removeLayout;
       vm.openIconPicker = openIconPicker;
 
-      function activate() {
-
-
-
-      }
-
       function addLayout() {
 
          vm.focusLayoutName = false;
@@ -62,13 +56,17 @@
          $scope.model.value.splice($index, 1);
       }
 
-      function openIconPicker(layout) {
+       function openIconPicker(layout) {
             var iconPicker = {
-                submit: function(model) {
-                    if (model.color) {
-                        layout.icon = model.icon + " " + model.color;
-                    } else {
-                        layout.icon = model.icon;
+                icon: layout.icon.split(' ')[0],
+                color: layout.icon.split(' ')[1],
+                submit: function (model) {
+                    if (model.icon) {
+                        if (model.color) {
+                            layout.icon = model.icon + " " + model.color;
+                        } else {
+                            layout.icon = model.icon;
+                        }
                     }
                     vm.focusLayoutName = true;
                     editorService.close();
@@ -80,8 +78,6 @@
             editorService.iconPicker(iconPicker);
         }
 
-      activate();
-
    }
 
    angular.module("umbraco").controller("Umbraco.PrevalueEditors.ListViewLayoutsPreValsController", ListViewLayoutsPreValsController);