yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use default color when previous selection removed (#7448)

Browse Source 
Thanks Nathan!
This commit is contained in:
Nathan Woulfe
2020-01-30 02:52:20 +10:00
committed by GitHub
parent 42fe20a11e
commit a945b0c511
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
View File

@@ -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() {