From 88857fa1b54ea5f8a6a8810152f4838769fba201 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 22 Oct 2018 12:53:26 +0200
Subject: [PATCH] show load indicator when dialog loads

---
 .../src/views/content/assigndomain.html          |  5 ++++-
 .../content/content.assigndomain.controller.js   | 16 +++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html b/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html
index 6a74b23d71..b0afd3c132 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/assigndomain.html
@@ -1,5 +1,8 @@
 <div ng-controller="Umbraco.Editors.Content.AssignDomainController as vm" ng-cloak>
-    <div class="umb-dialog-body">
+
+    <umb-load-indicator ng-show="vm.loading"></umb-load-indicator>
+
+    <div ng-hide="vm.loading" class="umb-dialog-body">
         
         <umb-pane ng-if="!currentNode.metaData.variesByCulture">
             <h5 class="umb-pane-title"><localize key="assignDomain_setLanguage">Culture</localize></h5>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
index b8b37914d7..b8478f9167 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.assigndomain.controller.js
@@ -11,12 +11,15 @@
         vm.languages = [];
         vm.domains = [];
         vm.language = null;
-        //vm.domainPattern = /^(http[s]?:\/\/)?([-\w]+(\.[-\w]+)*)(:\d+)?(\/[-\w]*|-)?$/gi; //TODO: This regex is not working as it should.
+        vm.domainPattern = /^(http[s]?:\/\/)?([-\w]+(\.[-\w]+)*)(:\d+)?(\/[-\w]*|-)?$/gi; //TODO: This regex is not working as it should.
         function activate() {
-            languageResource.getAll().then(function (langs) {
+
+            vm.loading = true;
+
+            languageResource.getAll().then(langs => {
                 vm.languages = langs;
 
-                var defLang = langs.filter(function (l) {
+                var defLang = langs.filter(l => {
                     return l.isDefault;
                 });
 
@@ -26,7 +29,9 @@
                 else {
                     vm.defaultLanguage = langs[0];
                 }
-                getCultureAndDomains();
+                getCultureAndDomains().then(() => {
+                    vm.loading = false;
+                });
             });
 
             localizationService.localize("assignDomain_inherit").then(function (value) {
@@ -36,7 +41,7 @@
         }
 
         function getCultureAndDomains () {
-            contentResource.getCultureAndDomains($scope.currentNode.id)
+            return contentResource.getCultureAndDomains($scope.currentNode.id)
                 .then(function (data) {
 
                     if (data.language !== "undefined") {
@@ -121,6 +126,7 @@
             }
             else {
                 console.log('not valid');
+                vm.submitButtonState = "error";
             }
         }