From 366dbbd54f3f912e12c9749fd22886863e561c55 Mon Sep 17 00:00:00 2001 From: Chrystal Maria Griffiths Date: Wed, 19 Dec 2018 10:27:22 +0000 Subject: [PATCH] Merge pull request #1288 from sharelatex/cmg-cancel-comments-ff Make comments cancel when you cancel them on firefox GitOrigin-RevId: 68b8be1ac34f0510103f3b9a8e7b617988fb55de --- .../review-panel/directives/addCommentEntry.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/services/web/public/src/ide/review-panel/directives/addCommentEntry.js b/services/web/public/src/ide/review-panel/directives/addCommentEntry.js index eadf6e8bc5..a10ff05754 100644 --- a/services/web/public/src/ide/review-panel/directives/addCommentEntry.js +++ b/services/web/public/src/ide/review-panel/directives/addCommentEntry.js @@ -50,13 +50,18 @@ define(['base'], App => return (scope.submitNewComment = function(event) { // If this is from a blur event from clicking on cancel, ignore it. - if ( - event != null && - event.type === 'blur' && - $(event.relatedTarget).hasClass('rp-entry-button-cancel') - ) { - return true + if (event != null && event.type === 'blur') { + if ( + // Includes relatedTarget workaround for Firefox + $(event.relatedTarget).hasClass('rp-entry-button-cancel') || + $(event.originalEvent.explicitOriginalTarget).hasClass( + 'rp-entry-button-cancel' + ) + ) { + return true + } } + scope.onSubmit({ content: scope.state.content }) scope.state.isAdding = false return (scope.state.content = '')