From f25db3ff64eba1356d4696812ee3e9d3b2661cfb Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 4 May 2017 15:47:25 +0100 Subject: [PATCH] Reflect accepted changes on the UI layer. --- .../aceEditor/track-changes/TrackChangesManager.coffee | 7 ++++++- .../controllers/ReviewPanelController.coffee | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee index 4c5f5fa96a..9eedb93eb9 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee @@ -32,6 +32,9 @@ define [ @$scope.$on "change:reject", (e, change_id) => @rejectChangeId(change_id) + @$scope.$on "change:bulk-accept", (e, change_ids) => + @bulkAcceptChangeIds(change_ids) + @$scope.$on "change:bulk-reject", (e, change_ids) => @bulkRejectChangeIds(change_ids) @@ -237,7 +240,9 @@ define [ throw new Error("unknown change: #{JSON.stringify(change)}") bulkAcceptChangeIds: (change_ids) -> - console.log change_id for change_id in change_ids + for change_id in change_ids + @rangesTracker.removeChangeId(change_id) + @updateAnnotations() bulkRejectChangeIds: (change_ids) -> for change_id in change_ids diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee index 2636060a47..bf5841c11b 100644 --- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee +++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee @@ -77,6 +77,15 @@ define [ $scope.$broadcast "change:accept", change_id updateEntries(doc_id) $scope.$apply () -> + + ide.socket.on "bulk-accept-changes", (doc_id, change_ids) -> + if doc_id != $scope.editor.open_doc_id + for change_id in change_ids + getChangeTracker(doc_id).removeChangeId(change_id) + else + $scope.$broadcast "change:bulk-accept", change_ids + updateEntries(doc_id) + $scope.$apply () -> ide.socket.on "resolve-thread", (thread_id, user) -> _onCommentResolved(thread_id, user)