From 17497e7cc717d9d7cc907148c8eabeb566a0bde3 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 13 Nov 2018 17:38:22 +0100
Subject: [PATCH] fixing up a bunch of close buttons in the context menu
 dialogs

---
 .../src/common/services/navigation.service.js              | 3 +--
 .../src/views/content/content.assigndomain.controller.js   | 4 ++--
 .../src/views/content/content.copy.controller.js           | 6 +++++-
 .../src/views/content/content.move.controller.js           | 6 +++++-
 .../src/views/content/content.sort.controller.js           | 5 +++++
 src/Umbraco.Web.UI.Client/src/views/content/copy.html      | 2 +-
 src/Umbraco.Web.UI.Client/src/views/content/create.html    | 2 +-
 src/Umbraco.Web.UI.Client/src/views/content/move.html      | 2 +-
 src/Umbraco.Web.UI.Client/src/views/content/sort.html      | 2 +-
 .../src/views/documenttypes/copy.controller.js             | 3 +++
 .../src/views/documenttypes/copy.html                      | 2 +-
 .../src/views/documenttypes/export.html                    | 2 +-
 .../src/views/documenttypes/import.controller.js           | 5 +++++
 .../src/views/documenttypes/importdocumenttype.html        | 2 +-
 .../src/views/documenttypes/move.controller.js             | 7 +++++--
 .../src/views/documenttypes/move.html                      | 2 +-
 .../src/views/media/media.move.controller.js               | 6 +++++-
 .../src/views/media/media.restore.controller.js            | 5 +++++
 .../src/views/media/media.sort.controller.js               | 5 +++++
 src/Umbraco.Web.UI.Client/src/views/media/move.html        | 2 +-
 src/Umbraco.Web.UI.Client/src/views/media/restore.html     | 2 +-
 src/Umbraco.Web.UI.Client/src/views/media/sort.html        | 2 +-
 22 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index d8370e99e0..568315df21 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -422,8 +422,7 @@ function navigationService($rootScope, $routeParams, $location, $q, $timeout, $i
                     appState.setMenuState("menuActions", data.menuItems);
                     appState.setMenuState("dialogTitle", args.node.name);
 
-                    //we're not opening a dialog, return null.
-                    return $q.resolve(null);
+                    return $q.resolve();
                 });
             
         },
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 ddd8f6436e..0f27f3046c 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
@@ -1,7 +1,7 @@
 (function () {
     "use strict";
 
-    function AssignDomainController($scope, localizationService, languageResource, contentResource) {
+    function AssignDomainController($scope, localizationService, languageResource, contentResource, navigationService) {
         var vm = this;
         
         vm.closeDialog = closeDialog;
@@ -73,7 +73,7 @@
         }
 
         function closeDialog() {
-            $scope.nav.hideDialog();
+            navigationService.hideDialog();
         }
 
         function addDomain() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
index 08f7bc9d8a..2642a79ac7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
@@ -77,7 +77,11 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
                 }
                 $scope.recursive = true;
             }
-        }
+		}
+		
+		$scope.closeDialog = function() {
+			navigationService.hideDialog();
+		};
 
 	    $scope.hideSearch = function () {
 	        $scope.searchInfo.showSearch = false;
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
index b5633d285f..a593bbad24 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
@@ -73,7 +73,11 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
 	    $scope.onSearchResults = function (results) {
 	        $scope.searchInfo.results = results;
 	        $scope.searchInfo.showSearch = true;
-	    };
+		};
+		
+		$scope.close = function() {
+			navigationService.hideDialog();
+		};
 
 	    $scope.move = function () {
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js
index 53759d7d97..d7f4cd9879 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.sort.controller.js
@@ -27,6 +27,7 @@
 
         vm.save = save;
         vm.sort = sort;
+        vm.close = close;
 
         function onInit() {
             vm.loading = true;
@@ -74,6 +75,10 @@
             vm.children = $filter('orderBy')(vm.children, vm.sortOrder.column, vm.sortOrder.reverse);
         }
 
+        function close() {
+            navigationService.hideDialog();
+        }
+
         onInit();
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/copy.html b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
index 018c543d08..10184dcccc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/copy.html
@@ -84,7 +84,7 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="nav.hideDialog()" ng-if="!busy">
+        <a class="btn btn-link" ng-click="closeDialog()" ng-if="!busy">
             <localize key="general_cancel">Cancel</localize>
         </a>
         <button class="btn btn-primary" ng-click="copy()" ng-disabled="busy">
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/create.html b/src/Umbraco.Web.UI.Client/src/views/content/create.html
index b287d68b94..a2ca17e799 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/create.html
@@ -49,7 +49,7 @@
 </div>
 
 <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-    <button class="btn btn-info" ng-click="nav.hideDialog(true)">
+    <button class="btn btn-info" ng-click="closeDialog(true)">
         <localize key="buttons_somethingElse">Do something else</localize>
     </button>
 </div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/move.html b/src/Umbraco.Web.UI.Client/src/views/content/move.html
index 746b9ecada..56ca1fe528 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/move.html
@@ -74,7 +74,7 @@
 
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="nav.hideDialog()" ng-if="!busy">
+        <a class="btn btn-link" ng-click="close()" ng-if="!busy">
             <localize key="general_cancel">Cancel</localize>
         </a>
         <button class="btn btn-primary" ng-click="move()" ng-disabled="busy">
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/sort.html b/src/Umbraco.Web.UI.Client/src/views/content/sort.html
index fd3eae1e7a..789f7fe6b5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/sort.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/sort.html
@@ -72,7 +72,7 @@
             <umb-button
                 type="button"
                 button-style="link"
-                action="nav.hideDialog()"
+                action="vm.close()"
                 label-key="general_close">
             </umb-button>
             <umb-button
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.controller.js
index b465e4deca..385ff13b25 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.controller.js
@@ -54,5 +54,8 @@ angular.module("umbraco")
             $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
         }
         
+        $scope.close = function() {
+            navigationService.hideDialog();
+        };
         
     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
index 6543d7a280..5094ac64a7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
@@ -45,7 +45,7 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="nav.hideDialog()" ng-if="!busy">
+        <a class="btn btn-link" ng-click="close()" ng-if="!busy">
             <localize key="general_cancel">Cancel</localize>
         </a>
         <button class="btn btn-primary" ng-click="copy()" ng-disabled="busy">
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/export.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/export.html
index 54c7ff0efe..0b9feb3fb6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/export.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/export.html
@@ -1,6 +1,6 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.DocumentTypes.ExportController">
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
-        <a class="btn btn-link" ng-click="nav.hideDialog()">
+        <a class="btn btn-link" ng-click="cancel()">
             <localize key="general_cancel">Cancel</localize>
         </a>
         <button class="btn btn-primary" ng-click="export()">
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js
index b7e09db84f..7ca85352ba 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/import.controller.js
@@ -68,4 +68,9 @@ angular.module("umbraco")
                 contentTypeResource.import(vm.model.tempFileName);
                 vm.state = "done";
             }
+
+            $scope.close = function() {
+                navigationService.hideDialog();
+            };
+            
         });
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
index db6c19da98..5fd453bcd7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
@@ -21,7 +21,7 @@
 
             <localize key="general_or">or</localize>
 
-            <a class="btn-link" ng-click="nav.hideDialog()">
+            <a class="btn-link" ng-click="close()">
                 <localize key="cancel">Cancel</localize>
             </a>
         </form>        
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.controller.js
index 1e8469d6cd..7d7d1f1bf8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.controller.js
@@ -57,7 +57,10 @@ angular.module("umbraco")
 
         $scope.onTreeInit = function () {
             $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
-        }
-        
+        };
+
+        $scope.close = function() {
+            navigationService.hideDialog();
+        };
         
     });
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
index a75c6346c7..65ba048515 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
@@ -45,7 +45,7 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-        <a class="btn btn-link" ng-click="nav.hideDialog()" ng-if="!busy">
+        <a class="btn btn-link" ng-click="close()" ng-if="!busy">
             <localize key="general_cancel">Cancel</localize>
         </a>
         <button class="btn btn-primary" ng-click="move()" ng-disabled="busy">
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
index a081e87095..88d657a2be 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
@@ -47,7 +47,11 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
             $scope.dialogTreeApi.callbacks.treeLoaded(treeLoadedHandler);
             $scope.dialogTreeApi.callbacks.treeNodeSelect(nodeSelectHandler);
             $scope.dialogTreeApi.callbacks.treeNodeExpanded(nodeExpandedHandler);
-        }	    
+        }	  
+        
+        $scope.close = function() {
+            navigationService.hideDialog();
+        };
 
 	    $scope.move = function () {
 	        mediaResource.move({ parentId: $scope.target.id, id: node.id })
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
index f45820dc1c..4e8bfb9a5d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js
@@ -81,4 +81,9 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.RestoreController",
 					$scope.error = err;
 				});
 		};
+
+		$scope.close = function() {
+			navigationService.hideDialog();
+		};
+
 	});
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
index e7d3cc2dfb..e5bde7c258 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.sort.controller.js
@@ -27,6 +27,7 @@
 
         vm.save = save;
         vm.sort = sort;
+        vm.close = close;
 
         function onInit() {
             vm.loading = true;
@@ -74,6 +75,10 @@
             vm.children = $filter('orderBy')(vm.children, vm.sortOrder.column, vm.sortOrder.reverse);
         }
 
+        function close() {
+            navigationService.hideDialog();
+        }
+
         onInit();
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/move.html b/src/Umbraco.Web.UI.Client/src/views/media/move.html
index be15f1d366..3d457cf807 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/move.html
@@ -50,7 +50,7 @@
     </div>
 
     <div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
-	    <a class="btn btn-link" ng-click="nav.hideDialog()"><localize key="general_cancel">Cancel</localize></a>
+	    <a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
 	    <button class="btn btn-primary" ng-click="move()"><localize key="actions_move">Move</localize></button>
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/restore.html b/src/Umbraco.Web.UI.Client/src/views/media/restore.html
index 17fff154d1..b8dcc8d5f3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/restore.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/restore.html
@@ -20,7 +20,7 @@
 	</div>
 
 	<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success == true">
-		<a class="btn btn-link" ng-click="nav.hideDialog()"><localize key="general_cancel">Cancel</localize></a>
+		<a class="btn btn-link" ng-click="close()"><localize key="general_cancel">Cancel</localize></a>
 		<button class="btn btn-primary" ng-click="restore()" ng-show="error == null"><localize key="actions_restore">Restore</localize></button>
 	</div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/sort.html b/src/Umbraco.Web.UI.Client/src/views/media/sort.html
index 14bf92ec42..92632a3256 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/sort.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/sort.html
@@ -72,7 +72,7 @@
         <umb-button
             type="button"
             button-style="link"
-            action="nav.hideDialog()"
+            action="vm.close()"
             label-key="general_close">
         </umb-button>
         <umb-button