From d536bebdbe15e646bd90015b4024f7dc2de774be Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Fri, 31 May 2019 19:22:23 +0200
Subject: [PATCH] V8: Show loading indicator while the Nested Content editor is
 loading (#5446)

---
 .../nestedcontent/nestedcontent.controller.js              | 7 +++----
 .../views/propertyeditors/nestedcontent/nestedcontent.html | 5 ++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 13295b1fbc..ef37b10154 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -95,8 +95,6 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
     "eventsService",
     
     function ($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService) {
-
-        var inited = false;
         
         var contentTypeAliases = [];
         _.each($scope.model.config.contentTypes, function (contentType) {
@@ -114,6 +112,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         $scope.realCurrentNode = undefined;
         $scope.scaffolds = undefined;
         $scope.sorting = false;
+        $scope.inited = false;
 
         $scope.minItems = $scope.model.config.minItems || 0;
         $scope.maxItems = $scope.model.config.maxItems || 0;
@@ -450,7 +449,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
                     $scope.currentNode = $scope.nodes[0];
                 }
 
-                inited = true;
+                $scope.inited = true;
                 
                 checkAbilityToPasteContent();
             }
@@ -519,7 +518,7 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
         function updateModel() {
             syncCurrentNode();
             
-            if (inited) {
+            if ($scope.inited) {
                 var newValues = [];
                 for (var i = 0; i < $scope.nodes.length; i++) {
                     newValues.push(convertNodeIntoNCEntry($scope.nodes[i]));
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
index a8a77e2d53..1eb7311ca7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
@@ -1,7 +1,10 @@
 <div id="umb-nested-content--{{model.id}}" class="umb-nested-content"
      ng-controller="Umbraco.PropertyEditors.NestedContent.PropertyEditorController"
      ng-class="{'umb-nested-content--narrow':!wideMode, 'umb-nested-content--wide':wideMode}">
-    <ng-form>
+
+    <umb-load-indicator ng-if="!inited"></umb-load-indicator>
+
+    <ng-form ng-if="inited">
 
         <div class="umb-nested-content__items" ng-hide="nodes.length === 0" ui-sortable="sortableOptions" ng-model="nodes">