Merge pull request #447 from sharelatex/ja-track-changes-bug-fixes

Track changes bug fixes

services/web/app/views/project/editor/review-panel.pug

@@ -340,10 +340,10 @@ script(type='text/ng-template', id='addCommentEntryTemplate')
 						ng-keypress="handleCommentKeyPress($event);"
 						placeholder=translate("add_your_comment_here")
 						focus-on="comment:new:open"
-						ng-blur="submitNewComment()"
+						ng-blur="submitNewComment($event)"
 					)
 				.rp-entry-actions
-					button.rp-entry-button(
+					button.rp-entry-button.rp-entry-button-cancel(
 						ng-click="cancelNewComment();"
 					) 
 						i.fa.fa-times

services/web/public/coffee/ide/review-panel/directives/addCommentEntry.coffee

@@ -31,7 +31,10 @@ define [
 					if scope.state.content.length > 0 
 						scope.submitNewComment()
 
-			scope.submitNewComment = () ->
+			scope.submitNewComment = (event) ->
+				# If this is from a blur event from clicking on cancel, ignore it.
+				if event? and event.type == "blur" and $(event.relatedTarget).hasClass("rp-entry-button-cancel")
+					return true
 				scope.onSubmit { content: scope.state.content }
 				scope.state.isAdding = false
 				scope.state.content = ""

services/web/public/stylesheets/app/editor/review-panel.less

@@ -117,6 +117,12 @@
 	z-index: 6;
 }
 
+.loading-panel {
+	.rp-size-expanded & {
+		right: @review-panel-width;
+	}
+}
+
 .review-panel-toolbar {
 	display: none;
 	.rp-size-expanded & {