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

V8: Show loading indicator while the Nested Content editor is loading (#5446)

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-05-31 19:22:23 +02:00
committed by Sebastiaan Janssen
parent 3639d952d5
commit d536bebdbe
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
View File

@@ -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]));

5
src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.html
View File

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