From fb91219661c86feef23cfeec5a125ebeeb932cfe Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 8 Mar 2017 11:38:28 +0000 Subject: [PATCH 1/2] Don't submit comment on clicking cancel --- services/web/app/views/project/editor/review-panel.pug | 4 ++-- .../ide/review-panel/directives/addCommentEntry.coffee | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug index fe5ada3596..b9dea40207 100644 --- a/services/web/app/views/project/editor/review-panel.pug +++ b/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 diff --git a/services/web/public/coffee/ide/review-panel/directives/addCommentEntry.coffee b/services/web/public/coffee/ide/review-panel/directives/addCommentEntry.coffee index c30eaadd0f..2ec79efcd5 100644 --- a/services/web/public/coffee/ide/review-panel/directives/addCommentEntry.coffee +++ b/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 = "" From 3a9f20cc1e2cd3d7dc243685b0fff58e6094916f Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 8 Mar 2017 11:42:14 +0000 Subject: [PATCH 2/2] Centre loading indicator when review panel is open --- .../web/public/stylesheets/app/editor/review-panel.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less index b46fd70992..7d2dbb1c9f 100644 --- a/services/web/public/stylesheets/app/editor/review-panel.less +++ b/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 & {