From 588252d94907ad98e4661bf00a833ae190fcb1b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 2 May 2017 08:56:03 +0200
Subject: [PATCH] Fix deleting boards and add a simple undo function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 css/style.css                   |  7 +++++++
 js/controller/ListController.js | 28 +++++++++++++++++++++++-----
 templates/part.navigation.php   |  9 +++++----
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/css/style.css b/css/style.css
index 629d45209..dbd51d56f 100644
--- a/css/style.css
+++ b/css/style.css
@@ -86,6 +86,13 @@ button:hover {
 	cursor: pointer;
 }
 
+#app-navigation .app-navigation-entry-utils li.board-delete-undo {
+	background-color: #aa0000;
+	color: #fff;
+	cursor: pointer;
+	width: auto !important;
+}
+
 /**
  * Board view
  */
diff --git a/js/controller/ListController.js b/js/controller/ListController.js
index b8c5ea390..7389aab35 100644
--- a/js/controller/ListController.js
+++ b/js/controller/ListController.js
@@ -21,10 +21,12 @@
  *  
  */
 
-app.controller('ListController', function ($scope, $location, $filter, BoardService, $element) {
+app.controller('ListController', function ($scope, $location, $filter, BoardService, $element, $timeout) {
 	$scope.boards = [];
 	$scope.newBoard = {};
-	$scope.status = {};
+	$scope.status = {
+		deleteUndo: []
+	};
 	$scope.colors = ['0082c9', '00c9c6','00c906', 'c92b00', 'F1DB50', '7C31CC', '3A3B3D', 'CACBCD'];
 	$scope.boardservice = BoardService;
 	$scope.newBoard.color = $scope.colors[0];
@@ -71,9 +73,25 @@ app.controller('ListController', function ($scope, $location, $filter, BoardServ
 	};
 
 	$scope.boardDelete = function(board) {
-		BoardService.delete(board.id).then(function (data) {
-			$scope.filterData();
-		});
+		var boardId = board.id;
+		$scope.status.deleteUndo[boardId] = 10;
+		$scope.boardDeleteCountdown = function () {
+			console.log($scope.status);
+			if($scope.status.deleteUndo[boardId] > 0) {
+				$scope.status.deleteUndo[boardId]--;
+				$timeout($scope.boardDeleteCountdown, 1000);
+			}
+			if($scope.status.deleteUndo[boardId] === 0) {
+				BoardService.delete(board.id).then(function (data) {
+					$scope.filterData();
+				});
+			}
+		};
+		$timeout($scope.boardDeleteCountdown, 1000);
+	};
+
+	$scope.boardDeleteUndo = function (board) {
+		delete $scope.status.deleteUndo[board.id];
 	};
 
 });
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index edbad1406..04bacfb54 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -7,15 +7,16 @@
 		<a href="#!/board/{{b.id}}/" ng-if="!b.status.edit">{{ b.title }}</a>
 		<div class="app-navigation-entry-utils" ng-show="!b.status.edit" style="position:absolute;">
 			<ul>
+				<li class="app-navigation-entry-utils-counter board-delete-undo" ng-show="status.deleteUndo[b.id]" ng-click="boardDeleteUndo(b)" title="Click to undo">Deleting in {{ status.deleteUndo[b.id] }}s &nbsp; X</li>
 				<li class="app-navigation-entry-utils-menu-share svg" ng-show="b.shared>0"><i class="icon icon-share" title="<?php p($l->t('Shared with you')); ?>"> </i></li>
-				<li class="app-navigation-entry-utils-menu-button svg"><button class="icon-more"></button></li>
+				<li class="app-navigation-entry-utils-menu-button svg" ng-show="!status.deleteUndo[b.id]"><button class="icon-more"></button></li>
 			</ul>
 		</div>
 		<div class="app-navigation-entry-menu app-navigation-noclose" ng-show="!b.status.edit">
 			<ul>
-				<li ng-show="b.owner===user"><button class="icon-rename svg" title="<?php p($l->t('edit')); ?>" ng-click="b.status.edit=true"></button></li>
-				<li ng-show="b.owner===user"><button class="icon-delete svg" title="<?php p($l->t('delete')); ?>" ng-click="boardDelete(b)"></button></li>
-				<li ng-show="b.owner!==user"><button class="icon-delete svg" title="<?php p($l->t('remove share')); ?>" ng-click="boardRemoveShare(b)"></button></li>
+				<li ng-show="b.owner.uid===user"><button class="icon-rename svg" title="<?php p($l->t('edit')); ?>" ng-click="b.status.edit=true"></button></li>
+				<li ng-show="b.owner.uid===user"><button class="icon-delete svg" title="<?php p($l->t('delete')); ?>" ng-click="boardDelete(b)"></button></li>
+				<li ng-show="b.owner.uid!==user && false"><button class="icon-delete svg" title="<?php p($l->t('remove share')); ?>" ng-click="boardRemoveShare(b)"></button></li>
 			</ul>
 		</div>
 		<div class="app-navigation-entry-deleted" ng-show="false">