From 8ff697ad98ae9bc53569061fe18603a127650a24 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Mon, 26 Nov 2018 22:47:42 +0100
Subject: [PATCH] Fix the flickering source name and the close button when
 moving items in the media tree.

---
 .../src/views/media/media.move.controller.js              | 8 ++++----
 src/Umbraco.Web.UI.Client/src/views/media/move.html       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

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 c5ff80b7fb..8bb1dc3ac8 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
@@ -3,7 +3,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
     function ($scope, userService, eventsService, mediaResource, appState, treeService, navigationService) {
 
 	    $scope.dialogTreeApi = {};
-	    var node = $scope.currentNode;
+        $scope.source = _.clone($scope.currentNode);
 
         $scope.treeModel = {
             hideHeader: false
@@ -13,8 +13,8 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
         });
 
         function treeLoadedHandler(args) {
-            if (node && node.path) {
-                $scope.dialogTreeApi.syncTree({ path: node.path, activate: false });
+            if ($scope.source && $scope.source.path) {
+                $scope.dialogTreeApi.syncTree({ path: $scope.source.path, activate: false });
             }
         }
 
@@ -55,7 +55,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
 
 	    $scope.move = function () {
 	        $scope.busy = true;
-	        mediaResource.move({ parentId: $scope.target.id, id: node.id })
+            mediaResource.move({ parentId: $scope.target.id, id: $scope.source.id })
                 .then(function (path) {
 	                $scope.busy = false;
                     $scope.error = false;
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 6d93eb4e22..451acbdb16 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/move.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/move.html
@@ -11,14 +11,14 @@
 
 		    <div ng-show="success">
 			    <div class="alert alert-success">
-				    <strong>{{currentNode.name}}</strong> was moved underneath <strong>{{target.name}}</strong>
+                    <strong>{{source.name}}</strong> was moved underneath <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>
 
 		    <p class="abstract" ng-hide="success">
                 <localize key="actions_chooseWhereToMove">Choose where to move</localize>
-                <strong>{{currentNode.name}}</strong>
+                <strong>{{source.name}}</strong>
                 <localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
             </p>