From 121629426e971c71fc1d8a46b1896ddf341e3c0b Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Mon, 16 Jan 2017 17:06:57 +0000
Subject: [PATCH] Avoid empty comment replies.

---
 .../web/app/views/project/editor/review-panel.jade  | 12 +++++++++---
 .../ide/review-panel/directives/commentEntry.coffee |  5 +++--
 .../public/stylesheets/app/editor/review-panel.less | 13 +++++++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade
index f0296a1d23..2646932ad2 100644
--- a/services/web/app/views/project/editor/review-panel.jade
+++ b/services/web/app/views/project/editor/review-panel.jade
@@ -195,10 +195,16 @@ script(type='text/ng-template', id='commentEntryTemplate')
 					placeholder="{{ 'Hit \"Enter\" to reply' + (entry.resolved ? ' and re-open' : '') }}"
 				)
 			.rp-entry-actions
-				a.rp-entry-button(href, ng-click="animateAndCallOnResolve();", ng-if="permissions.comment && permissions.write") 
+				button.rp-entry-button(
+					ng-click="animateAndCallOnResolve();"
+					ng-if="permissions.comment && permissions.write"
+				) 
 					i.fa.fa-inbox
 					| &nbsp;Resolve
-				a.rp-entry-button(href, ng-click="onReply();", ng-if="permissions.comment")
+				button.rp-entry-button(
+					ng-click="onReply();"
+					ng-if="permissions.comment"
+					ng-disabled="!entry.replyContent.length")
 					i.fa.fa-reply
 					| &nbsp;Reply
 	
@@ -214,7 +220,7 @@ script(type='text/ng-template', id='resolvedCommentEntryTemplate')
 						href
 						ng-if="needsCollapsing"
 						ng-click="toggleCollapse();"
-					) &nbsp;{{ isCollapsed ? '(more)' : '(less)' }}
+					) &nbsp;{{ isCollapsed ? '... (show all)' : ' (show less)' }}
 			.rp-comment(
 				ng-repeat="comment in thread.messages track by comment.id"
 			)
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 2d32f7f20e..63a20c2243 100644
--- a/services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee
+++ b/services/web/public/coffee/ide/review-panel/directives/commentEntry.coffee
@@ -18,8 +18,9 @@ define [
 			scope.handleCommentReplyKeyPress = (ev) ->
 				if ev.keyCode == 13 and !ev.shiftKey and !ev.ctrlKey and !ev.metaKey
 					ev.preventDefault()
-					ev.target.blur()
-					scope.onReply()
+					if scope.entry.length > 0 
+						ev.target.blur()
+						scope.onReply()
 			
 			scope.animateAndCallOnResolve = () ->
 				scope.state.animating = true
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 3c3d4dc250..36e420633b 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -36,12 +36,25 @@
 	color: #FFF;
 	text-align: center;
 	line-height: 1.3;
+	user-select: none;
+	border: 0;
+
 	&:hover,
 	&:focus {
+		outline: 0;
 		background-color: darken(@rp-highlight-blue, 5%);
 		text-decoration: none;
 		color: #FFF;
 	}
+
+	&[disabled] {
+		opacity: 0.5;
+
+		&:hover,
+		&:focus {
+			background-color: @rp-highlight-blue;
+		}
+	}
 }
 
 .triangle(@_, @width, @height, @color) {