From a3c457e50b09746b3123f2771024775bccc4defc Mon Sep 17 00:00:00 2001 From: theotron Date: Fri, 12 Aug 2016 14:39:12 +0100 Subject: [PATCH] Fixes U4-8845 - Double-click on confirm delete, deletes from bin as well http://issues.umbraco.org/issue/U4-8845 --- .../src/views/content/content.delete.controller.js | 5 +++++ .../src/views/media/media.delete.controller.js | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js index 1d24fee190..b0b7fc2312 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js @@ -10,8 +10,12 @@ function ContentDeleteController($scope, contentResource, treeService, navigatio $scope.performDelete = function() { + // stop from firing again on double-click + if ($scope.busy) { return false; } + //mark it for deletion (used in the UI) $scope.currentNode.loading = true; + $scope.busy = true; contentResource.deleteById($scope.currentNode.id).then(function () { $scope.currentNode.loading = false; @@ -44,6 +48,7 @@ function ContentDeleteController($scope, contentResource, treeService, navigatio }, function(err) { $scope.currentNode.loading = false; + $scope.busy = false; //check if response is ysod if (err.status && err.status >= 500) { diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js index 99f40d14bb..a8be3d0be5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js @@ -10,8 +10,12 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer $scope.performDelete = function() { + // stop from firing again on double-click + if ($scope.busy) { return false; } + //mark it for deletion (used in the UI) $scope.currentNode.loading = true; + $scope.busy = true; mediaResource.deleteById($scope.currentNode.id).then(function () { $scope.currentNode.loading = false; @@ -45,6 +49,7 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer }, function (err) { $scope.currentNode.loading = false; + $scope.busy = false; //check if response is ysod if (err.status && err.status >= 500) {