From d054771fc6b15e38562f00725ea37ca305405eaa Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 11 Dec 2018 17:23:31 +0100
Subject: [PATCH] Fix the flickering name when moving/copying doctypes

---
 .../src/views/documenttypes/copy.controller.js              | 3 ++-
 src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html | 6 +++---
 .../src/views/documenttypes/move.controller.js              | 3 ++-
 src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

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 385ff13b25..2039175819 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
@@ -3,6 +3,7 @@ angular.module("umbraco")
     function ($scope, contentTypeResource, treeService, navigationService, notificationsService, appState, eventsService) {
 
         $scope.dialogTreeApi = {};
+        $scope.source = _.clone($scope.currentNode);
 
         function nodeSelectHandler(args) {
             args.event.preventDefault();
@@ -22,7 +23,7 @@ angular.module("umbraco")
             $scope.busy = true;
             $scope.error = false;
 
-            contentTypeResource.copy({ parentId: $scope.target.id, id: $scope.currentNode.id })
+            contentTypeResource.copy({ parentId: $scope.target.id, id: $scope.source.id })
                 .then(function (path) {
                     $scope.error = false;
                     $scope.success = true;
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 565410f363..4b90c244e8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html
@@ -4,7 +4,7 @@
         <div class="umb-pane">
 
             <p class="abstract" ng-hide="success">
-                <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{currentNode.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
+                <localize key="contentTypeEditor_folderToCopy">Select the folder to copy</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
             <div class="umb-loader-wrapper" ng-show="busy">
@@ -20,9 +20,9 @@
 
             <div ng-show="success">
                 <div class="alert alert-success">
-                    <strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
+                    <strong>{{source.name}}</strong> <localize key="contentTypeEditor_copiedUnderneath">was copied underneath</localize>&nbsp;<strong>{{target.name}}</strong>
                 </div>
-                <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+                <button class="btn btn-primary" ng-click="close()">Ok</button>
             </div>
 
             <div ng-hide="success">
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 7d7d1f1bf8..e63656cee3 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
@@ -3,6 +3,7 @@ angular.module("umbraco")
     function ($scope, contentTypeResource, treeService, navigationService, notificationsService, appState, eventsService) {
 
         $scope.dialogTreeApi = {};
+        $scope.source = _.clone($scope.currentNode);
 
         function nodeSelectHandler(args) {
             args.event.preventDefault();
@@ -22,7 +23,7 @@ angular.module("umbraco")
             $scope.busy = true;
             $scope.error = false;
 
-            contentTypeResource.move({ parentId: $scope.target.id, id: $scope.currentNode.id })
+            contentTypeResource.move({ parentId: $scope.target.id, id: $scope.source.id })
                 .then(function (path) {
                     $scope.error = false;
                     $scope.success = true;
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 af0ce58227..6b81c15bc5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html
@@ -4,7 +4,7 @@
         <div class="umb-pane">
 
             <p class="abstract" ng-hide="success">
-                <localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> <strong>{{currentNode.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
+                <localize key="contentTypeEditor_folderToMove">Select the folder to move</localize> <strong>{{source.name}}</strong>&nbsp;<localize key="contentTypeEditor_structureBelow">to in the tree structure below</localize>
             </p>
 
             <div class="umb-loader-wrapper" ng-show="busy">
@@ -20,9 +20,9 @@
 
             <div ng-show="success">
                 <div class="alert alert-success">
-                    <strong>{{currentNode.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
+                    <strong>{{source.name}}</strong> <localize key="contentTypeEditor_movedUnderneath">was moved underneath</localize>&nbsp;<strong>{{target.name}}</strong>
                 </div>
-                <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+                <button class="btn btn-primary" ng-click="close()">Ok</button>
             </div>
 
             <div ng-hide="success">