Просмотр исходного кода

Trigger selection-related logic after accepting or rejecting changes.

Paulo Reis 9 лет назад
Родитель
Сommit
53b18e041f

+ 3 - 1
services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee

@@ -210,6 +210,7 @@ define [
 		acceptChangeIds: (change_ids) ->
 			@rangesTracker.removeChangeIds(change_ids)
 			@updateAnnotations()
+			@updateFocus()
 
 		rejectChangeIds: (change_ids) ->
 			changes = @rangesTracker.getChanges(change_ids)
@@ -288,7 +289,8 @@ define [
 					session.$fromReject = false
 				else
 					throw new Error("unknown change: #{JSON.stringify(change)}")
-
+			@updateFocus()
+			
 		removeCommentId: (comment_id) ->
 			@rangesTracker.removeCommentId(comment_id)
 			@updateAnnotations()

+ 0 - 6
services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee

@@ -374,9 +374,6 @@ define [
 
 		bulkAccept = () ->
 			_doAcceptChanges $scope.reviewPanel.selectedEntryIds.slice()
-			$timeout () ->
-				$scope.reviewPanel.selectedEntryIds = []
-				$scope.reviewPanel.nVisibleSelectedChanges = 0
 			event_tracking.sendMB "rp-bulk-accept", { 
 				view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini',  
 				nEntries: $scope.reviewPanel.nVisibleSelectedChanges
@@ -384,9 +381,6 @@ define [
 
 		bulkReject = () ->
 			_doRejectChanges $scope.reviewPanel.selectedEntryIds.slice()
-			$timeout () ->
-				$scope.reviewPanel.selectedEntryIds = []
-				$scope.reviewPanel.nVisibleSelectedChanges = 0
 			event_tracking.sendMB "rp-bulk-reject", { 
 				view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini',  
 				nEntries: $scope.reviewPanel.nVisibleSelectedChanges