Prevent 'mark read on scroll' during fetches

FREEBIE
signalapp · Jun 1, 2017 · 944ae29 · 944ae29
1 parent 5194b88
commit 944ae29
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
@@ -208,7 +208,10 @@
         },
 
         onLazyScroll: function() {
-            if (!this.isHidden() && window.isFocused()) {
+            // The in-progress fetch check is important, because while that happens, lots
+            //   of messages are added to the DOM, one by one, changing window size and
+            //   generating scroll events.
+            if (!this.isHidden() && window.isFocused() && !this.inProgressFetch) {
                 this.markRead();
             }
         },