From f17ce2705c3837810c9a7845c1df7949a1e9533e Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 10 Jan 2017 17:17:07 +0100 Subject: [PATCH] Don't include wrapper for resolved comments, since it throws the review panel layout off --- services/web/app/views/project/editor/review-panel.jade | 6 ++++-- .../review-panel/controllers/ReviewPanelController.coffee | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade index 34e49f03f0..0b914a3443 100644 --- a/services/web/app/views/project/editor/review-panel.jade +++ b/services/web/app/views/project/editor/review-panel.jade @@ -24,6 +24,7 @@ .rp-entry-list-inner .rp-entry-wrapper( ng-repeat="(entry_id, entry) in reviewPanel.entries[editor.open_doc_id]" + ng-if="!(entry.type === 'comment' && reviewPanel.commentThreads[entry.thread_id].resolved === true)" ) div(ng-if="entry.type === 'insert' || entry.type === 'delete'") change-entry( @@ -34,7 +35,7 @@ on-indicator-click="toggleReviewPanel();" ) - div(ng-if="entry.type === 'comment' && !(reviewPanel.commentThreads[entry.thread_id].resolved === true)") + div(ng-if="entry.type === 'comment'") comment-entry( entry="entry" threads="reviewPanel.commentThreads" @@ -66,6 +67,7 @@ | {{ doc.path }} .rp-entry-wrapper( ng-repeat="(entry_id, entry) in reviewPanel.entries[doc.doc.id] | orderOverviewEntries" + ng-if="!(entry.type === 'comment' && reviewPanel.commentThreads[entry.thread_id].resolved === true)" ) div(ng-if="entry.type === 'insert' || entry.type === 'delete'") change-entry( @@ -75,7 +77,7 @@ ng-click="gotoEntry(doc_id, entry)" ) - div(ng-if="entry.type === 'comment' && !(reviewPanel.commentThreads[entry.thread_id].resolved === true)") + div(ng-if="entry.type === 'comment'") comment-entry( entry="entry" threads="reviewPanel.commentThreads" 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 15ead40e84..d8c307d66e 100644 --- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee +++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee @@ -38,7 +38,6 @@ define [ $scope.$broadcast "review-panel:layout" ide.socket.on "accept-change", (doc_id, change_id) -> - console.log "Got remote accept change", doc_id, change_id if doc_id != $scope.editor.open_doc_id getChangeTracker(doc_id).removeChangeId(change_id) else