From d0e7344e2d3da1eeb6acf35b976804bfec5dd95a Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Sun, 18 Aug 2019 21:40:27 +0200 Subject: [PATCH] Prevent double click errors when editing compositions --- .../common/directives/components/umbgroupsbuilder.directive.js | 3 +++ .../src/views/components/umb-groups-builder.html | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js index c1f34e64ae..05c3ae43e7 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js @@ -17,6 +17,7 @@ scope.sortableOptionsGroup = {}; scope.sortableOptionsProperty = {}; scope.sortingButtonKey = "general_reorder"; + scope.compositionsButtonState = "init"; function activate() { @@ -337,6 +338,7 @@ })), function(f) { return f !== null && f !== undefined; }); + scope.compositionsButtonState = "busy"; $q.all([ //get available composite types availableContentTypeResource(scope.model.id, [], propAliasesExisting).then(function (result) { @@ -356,6 +358,7 @@ ]).then(function() { //resolves when both other promises are done, now show it editorService.open(scope.compositionsDialogModel); + scope.compositionsButtonState = "init"; }); }; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html index 026b0637c7..e8e47f6ae6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html @@ -14,7 +14,8 @@ icon="icon-merge" action="openCompositionsDialog()" size="xs" - add-ellipsis="true"> + add-ellipsis="true" + state="compositionsButtonState">