From c5532bd8a3adda45491061528ac087960a066b18 Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Wed, 9 Nov 2016 15:51:40 +0000
Subject: [PATCH] Add cancel buttons for comments

---
 services/web/app/views/project/editor/editor.jade     |  2 ++
 .../controllers/ReviewPanelController.coffee          | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/services/web/app/views/project/editor/editor.jade b/services/web/app/views/project/editor/editor.jade
index a47920fa0e..97d2b431f7 100644
--- a/services/web/app/views/project/editor/editor.jade
+++ b/services/web/app/views/project/editor/editor.jade
@@ -62,12 +62,14 @@ div.full-size(
 							div(ng-if="entry.replying")
 								textarea(ng-model="entry.replyContent")
 								a.btn.btn-sm.btn-primary(href, ng-click="submitReply(entry)") Submit
+								a(href, ng-click="cancelReply(entry)") X
 							a.btn.btn-sm.btn-primary(href, ng-click="startReply(entry)", ng-if="!entry.replying") Reply
 						div(ng-if="entry.type == 'focus-position'")
 							a.btn.btn-sm(href, ng-if="!commentState.adding", ng-click="startNewComment()") Add comment
 							div(ng-if="commentState.adding")
 								textarea(ng-model="commentState.content")
 								a.btn.btn-sm.btn-primary(href, ng-click="submitNewComment()") Submit
+								a(href, ng-click="cancelNewComment()") X
 
 	.ui-layout-east
 		div(ng-if="ui.pdfLayout == 'sideBySide'")
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 0291412bc2..1e9684e588 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -70,8 +70,12 @@ define [
 			$scope.commentState.content = ""
 			$scope.$broadcast "review-panel:layout"
 		
+		$scope.cancelNewComment = (entry) ->
+			$scope.commentState.adding = false
+			$scope.commentState.content = ""
+			$scope.$broadcast "review-panel:layout"
+		
 		$scope.startReply = (entry) ->
-			console.log "Start new reply"
 			entry.replying = true
 			$scope.$broadcast "review-panel:layout"
 		
@@ -83,4 +87,9 @@ define [
 			}
 			entry.replyContent = ""
 			entry.replying = false
+			$scope.$broadcast "review-panel:layout"
+		
+		$scope.cancelReply = (entry) ->
+			entry.replying = false
+			entry.replyContent = ""
 			$scope.$broadcast "review-panel:layout"
\ No newline at end of file