Merge branch 'v8/dev' into temp-bellefixes

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

@@ -208,8 +208,9 @@ Opens an overlay to show a custom YSOD. </br>
          var numberOfOverlays = 0;
          var isRegistered = false;
 
-          var modelCopy = {};
+
-          var unsubscribe = [];
+         var modelCopy = {};
+         var unsubscribe = [];
 
          function activate() {
 
@@ -221,8 +222,23 @@ Opens an overlay to show a custom YSOD. </br>
 
             $timeout(function() {
 
-               if (scope.position === "target") {
+               if (scope.position === "target" && scope.model.event) {
                   setTargetPosition();
+
+                  // update the position of the overlay on content changes
+                  // as these affect the layout/size of the overlay
+                  if ('ResizeObserver' in window)
+                  {
+                     var resizeObserver = new ResizeObserver(setTargetPosition);
+                     var contentArea = document.getElementById("contentwrapper");
+                     resizeObserver.observe(el[0]);
+                     if (contentArea) {
+                        resizeObserver.observe(contentArea);
+                     }
+                     unsubscribe.push(function () {
+                        resizeObserver.disconnect();
+                     });
+                  }
                }
 
                // this has to be done inside a timeout to ensure the destroy
@@ -397,50 +413,44 @@ Opens an overlay to show a custom YSOD. </br>
                bottom: "inherit"
             };
 
-            // if mouse click position is know place element with mouse in center
+            // click position
-            if (scope.model.event && scope.model.event) {
+            mousePositionClickX = scope.model.event.pageX;
+            mousePositionClickY = scope.model.event.pageY;
 
-               // click position
+            // element size
-               mousePositionClickX = scope.model.event.pageX;
+            elementHeight = el[0].clientHeight;
-               mousePositionClickY = scope.model.event.pageY;
+            elementWidth = el[0].clientWidth;
 
-               // element size
+            // move element to this position
-               elementHeight = el[0].clientHeight;
+            position.left = mousePositionClickX - (elementWidth / 2);
-               elementWidth = el[0].clientWidth;
+            position.top = mousePositionClickY - (elementHeight / 2);
-
-               // move element to this position
-               position.left = mousePositionClickX - (elementWidth / 2);
-               position.top = mousePositionClickY - (elementHeight / 2);
-
-               // check to see if element is outside screen
-               // outside right
-               if (position.left + elementWidth > containerRight) {
-                  position.right = 10;
-                  position.left = "inherit";
-               }
-
-               // outside bottom
-               if (position.top + elementHeight > containerBottom) {
-                  position.bottom = 10;
-                  position.top = "inherit";
-               }
-
-               // outside left
-               if (position.left < containerLeft) {
-                  position.left = containerLeft + 10;
-                  position.right = "inherit";
-               }
-
-               // outside top
-               if (position.top < containerTop) {
-                  position.top = 10;
-                  position.bottom = "inherit";
-               }
-
-               el.css(position);
 
+            // check to see if element is outside screen
+            // outside right
+            if (position.left + elementWidth > containerRight) {
+                position.right = 10;
+                position.left = "inherit";
             }
 
+            // outside bottom
+            if (position.top + elementHeight > containerBottom) {
+                position.bottom = 10;
+                position.top = "inherit";
+            }
+
+            // outside left
+            if (position.left < containerLeft) {
+                position.left = containerLeft + 10;
+                position.right = "inherit";
+            }
+
+            // outside top
+            if (position.top < containerTop) {
+                position.top = 10;
+                position.bottom = "inherit";
+            }
+
+            el.css(position);
          }
 
          scope.submitForm = function(model) {

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";