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

Fix issues in newly added buttongroup localization (#18254)

Browse Source 
* Fix #18253 nullref exception

* Fix #18239 by listening to broader scope changes
This commit is contained in:
Sven Geusens
2025-02-07 07:00:34 +01:00
committed by GitHub
parent 095a73132c
commit 280cb7f2b1
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js
View File

@@ -90,9 +90,7 @@ Use this directive to render a button with a dropdown of alternative actions.
**/
(function () {
'use strict';
function ButtonGroupDirective() {
function controller($scope, localizationService) {
$scope.toggleStyle = null;
$scope.blockElement = false;
@@ -125,18 +123,24 @@ Use this directive to render a button with a dropdown of alternative actions.
// As the <localize /> directive doesn't support Angular expressions as fallback, we instead listen for changes
// to the label key of the default button, and if detected, we update the button label with the localized value
// received from the localization service
$scope.$watch("defaultButton.labelKey", function () {
if (!$scope.defaultButton.labelKey) return;
$scope.$watch("defaultButton", localizeDefaultButtonLabel);
$scope.$watch("defaultButton.labelKey", localizeDefaultButtonLabel);
function localizeDefaultButtonLabel() {
if (!$scope.defaultButton?.labelKey) return;
localizationService.localize($scope.defaultButton.labelKey).then(value => {
if (value && value.indexOf("[") === 0) return;
$scope.defaultButton.label = value;
});
});
}
// In a similar way, we must listen for changes to the sub buttons (or their label keys), and if detected, update
// the label with the localized value received from the localization service
$scope.$watch("defaultButton.subButtons", function () {
if (!Array.isArray($scope.subButtons)) return;
$scope.$watch("subButtons", localizeSubButtons, true);
$scope.$watch("defaultButton.subButtons", localizeSubButtons, true);
function localizeSubButtons() {
if (!$scope.subButtons || !Array.isArray($scope.subButtons)) return;
$scope.subButtons.forEach(function (sub) {
if (!sub.labelKey) return;
localizationService.localize(sub.labelKey).then(value => {
@@ -144,7 +148,7 @@ Use this directive to render a button with a dropdown of alternative actions.
sub.label = value;
});
});
}, true);
}
}