Просмотр исходного кода

Merge pull request #1288 from sharelatex/cmg-cancel-comments-ff

Make comments cancel when you cancel them on firefox

GitOrigin-RevId: 68b8be1ac34f0510103f3b9a8e7b617988fb55de
Chrystal Maria Griffiths 7 лет назад
Родитель
Сommit
366dbbd54f
1 измененных файлов с 11 добавлено и 6 удалено
  1. 11 6
      services/web/public/src/ide/review-panel/directives/addCommentEntry.js

+ 11 - 6
services/web/public/src/ide/review-panel/directives/addCommentEntry.js

@@ -50,13 +50,18 @@ define(['base'], App =>
 
 
       return (scope.submitNewComment = function(event) {
       return (scope.submitNewComment = function(event) {
         // If this is from a blur event from clicking on cancel, ignore it.
         // 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.onSubmit({ content: scope.state.content })
         scope.state.isAdding = false
         scope.state.isAdding = false
         return (scope.state.content = '')
         return (scope.state.content = '')