Merge branch 'v8/dev' into temp-bellefixes

src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js

@@ -249,8 +249,14 @@
 
       };
 
-      scope.openCompositionsDialog = function() {
 
+      scope.isCompositionsDialogLoading = false;
+
+      scope.openCompositionsDialog = function() {
+        if (scope.isCompositionsDialogLoading) {
+            return;
+        }
+        scope.isCompositionsDialogLoading = true;
         scope.compositionsDialogModel = {
             contentType: scope.model,
             compositeContentTypes: scope.model.compositeContentTypes,
@@ -267,7 +273,7 @@
 
               // remove overlay
               editorService.close();
-
+              scope.isCompositionsDialogLoading = false;
             },
             close: function(oldModel) {
 
@@ -277,7 +283,7 @@
 
                 // remove overlay
                 editorService.close();
-
+                scope.isCompositionsDialogLoading = false;
             },
             selectCompositeContentType: function (selectedContentType) {
 
@@ -356,6 +362,7 @@
                 scope.compositionsDialogModel.totalContentTypes = parseInt(result, 10);
             })
         ]).then(function() {
+            scope.isCompositionsDialogLoading = false;
             //resolves when both other promises are done, now show it
             editorService.open(scope.compositionsDialogModel);
             scope.compositionsButtonState = "init";