do not trigger markRead if conversation isHidden

5 years ago · d1bd829011
parent 56a81ccc93
commit d1bd829011
1 changed files with 3 additions and 5 deletions
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@ -391,10 +391,7 @@
      this.window.addEventListener('resize', this.onResize);

      this.onFocus = () => {
-        if (
-          this.$el.css('display') !== 'none' &&
-          this.$el.css('display') !== ''
-        ) {
+        if (!this.isHidden()) {
          this.markRead();
        }
      };
@ -2654,7 +2651,8 @@

    isHidden() {
      return (
-        this.$el.css('display') === 'none' ||
+        (this.$el.css('display') !== 'none' &&
+          this.$el.css('display') !== '') ||
        this.$('.panel').css('display') === 'none'
      );
    },