From a492976a329ac886557c4b767ffee7351a2b99b7 Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 1 Apr 2014 10:08:50 +0200 Subject: [PATCH] Fixes: U4-4557 Color Picker - default is black, but it can't be added without choosing another color first Sets color to be black by default, so will be added if you click add without setting anything, so its consistent with the default swatch --- .../colorpicker/multicolorpicker.controller.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js index ab7a343972..5094ff87fd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js @@ -1,8 +1,9 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiColorPickerController", function ($scope, $timeout, assetsService, angularHelper, $element) { //NOTE: We need to make each color an object, not just a string because you cannot 2-way bind to a primitive. - - $scope.newColor = ""; + var defaultColor = "000000"; + + $scope.newColor = defaultColor; $scope.hasError = false; assetsService.load([ @@ -67,7 +68,7 @@ }); if (!exists) { $scope.model.value.push({ value: $scope.newColor }); - $scope.newColor = ""; + $scope.newColor = defaultColor; $scope.hasError = false; return; }