From ad857a15f90e8b8538b0b10a03b55161427212a0 Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Mon, 21 Nov 2016 11:16:23 +0000
Subject: [PATCH] Style resolved comments in the current file pane.

---
 .../web/app/views/project/editor/review-panel.jade    |  9 +++++++--
 .../controllers/ReviewPanelController.coffee          | 11 +++++++++++
 .../ide/review-panel/directives/commentEntry.coffee   |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade
index 9a7bc4f9a5..c02a556532 100644
--- a/services/web/app/views/project/editor/review-panel.jade
+++ b/services/web/app/views/project/editor/review-panel.jade
@@ -25,6 +25,8 @@
 						users="users"
 						on-resolve="resolveComment(entry, entry_id)"
 						on-unresolve="unresolveComment(entry_id)"
+						on-show-thread="showThread(entry)"
+						on-hide-thread="hideThread(entry)"
 						on-delete="deleteComment(entry_id)"
 						on-reply="submitReply(entry, entry_id);"
 						on-indicator-click="toggleReviewPanel();"
@@ -158,12 +160,15 @@ script(type='text/ng-template', id='commentEntryTemplate')
 					placeholder="{{ 'Hit \"Enter\" to reply' + (entry.resolved ? ' and re-open' : '') }}"
 				)
 			.rp-comment-resolved-description(ng-if="entry.resolved && !entry.showWhenResolved")
-				| Resolved Comment
-				a(href, ng-click="entry.showWhenResolved = true") Show
+				| Resolved comment
 			.rp-entry-actions
 				a.rp-entry-button(href, ng-click="onResolve();", ng-if="!entry.resolved") 
 					i.fa.fa-check
 					| &nbsp;Mark as resolved
+				a.rp-entry-button(href, ng-click="onShowThread();", ng-if="entry.resolved && !entry.showWhenResolved")
+					| &nbsp;Show
+				a.rp-entry-button(href, ng-click="onHideThread();", ng-if="entry.resolved && entry.showWhenResolved")
+					| &nbsp;Hide
 				a.rp-entry-button(href, ng-click="onUnresolve();", ng-if="entry.resolved") 
 					| &nbsp;Re-open
 				a.rp-entry-button(href, ng-click="onDelete();", ng-if="entry.resolved") 
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 63c9e6060c..c0bd379889 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -143,6 +143,7 @@ define [
 
 		$scope.resolveComment = (entry, entry_id) ->
 			entry.showWhenResolved = false
+			entry.focused = false
 			$scope.$broadcast "comment:resolve", entry_id
 		
 		$scope.unresolveComment = (entry_id) ->
@@ -151,6 +152,16 @@ define [
 		$scope.deleteComment = (entry_id) ->
 			$scope.$broadcast "comment:remove", entry_id
 
+		$scope.showThread = (entry) ->
+			entry.showWhenResolved = true
+			$timeout () ->
+				$scope.$broadcast "review-panel:layout"
+
+		$scope.hideThread = (entry) ->
+			entry.showWhenResolved = false
+			$timeout () ->
+				$scope.$broadcast "review-panel:layout"
+
 		$scope.setSubView = (subView) -> 
 			$scope.reviewPanel.subView = subView
 						
diff --git a/services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee b/services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee
index 1f15f688dd..6938062e2b 100644
--- a/services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee
+++ b/services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee
@@ -12,6 +12,8 @@ define [
 			onIndicatorClick: "&"
 			onDelete: "&"
 			onUnresolve: "&"
+			onShowThread: "&"
+			onHideThread: "&"
 		link: (scope, element, attrs) ->
 			scope.handleCommentReplyKeyPress = (ev) ->
 				if ev.keyCode == 13 and !ev.shiftKey and !ev.ctrlKey and !ev.metaKey