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

Update label when updating color (#13720)

Browse Source 
Co-authored-by: Zeegaan <nge@umbraco.dk>
This commit is contained in:
Nikolaj Geisle
2023-01-27 09:52:37 +01:00
committed by GitHub
parent f275d80e2f
commit 03365f55c4
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
View File

@@ -18,7 +18,7 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiColorPickerCo
// NOTE: We need to make each color an object, not just a string because you cannot 2-way bind to a primitive.
const defaultColor = "000000";
const defaultLabel = null;
$scope.newColor = defaultColor;
$scope.newLabel = defaultLabel;
$scope.hasError = false;
@@ -48,20 +48,20 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiColorPickerCo
}
});
}
var evts = [];
evts.push(eventsService.on("toggleValue", function (e, args) {
if (args.inputId === "useLabel") {
vm.labelEnabled = args.value;
}
}));
$scope.$on('$destroy', function () {
for (var e in evts) {
eventsService.unsubscribe(evts[e]);
}
});
if (!Utilities.isArray($scope.model.value)) {
//make an array from the dictionary
var items = [];
@@ -127,11 +127,20 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiColorPickerCo
label: newLabel
});
} else {
if(vm.editItem.value === vm.editItem.label && vm.editItem.value === newLabel) {
vm.editItem.label = $scope.newColor;
}
else {
vm.editItem.label = newLabel;
}
vm.editItem.value = $scope.newColor;
vm.editItem.label = newLabel;
vm.editItem = null;
}
$scope.newLabel = "";
$scope.hasError = false;
$scope.focusOnNew = true;