closing tabs behavior #1014

luyadev · Oct 18, 2016 · a2db25b · a2db25b
1 parent 153e4fc
commit a2db25b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/modules/admin/src/resources/js/controllers.js b/modules/admin/src/resources/js/controllers.js
@@ -71,7 +71,7 @@
 		};
 
 		$scope.closeTab = function(tab, index) {
-			$scope.tabService.remove(index);
+			$scope.tabService.remove(index, $scope);
 		};
 
 		$scope.switchTo = function(type, reset) {

diff --git a/modules/admin/src/resources/js/services.js b/modules/admin/src/resources/js/services.js
@@ -291,8 +291,15 @@ zaa.factory("CrudTabService", function() {
 
 	service.tabs = [];
 
-	service.remove = function(index) {
+	service.remove = function(index, $scope) {
 		service.tabs.splice(index, 1);
+
+		if (service.tabs.length > 0) {
+			var lastTab = service.tabs.slice(-1)[0];
+			lastTab.active = true;
+		} else {
+			$scope.switchTo(0);
+		}
 	};
 
 	service.addTab = function(id, api, arrayIndex, name, modelClass) {