pointer: Merge pointer.js into message_scroll.js.

Ths remaining code here is naturally message scrolling logic, and fits
well into the existing file for handling that.

frontend_tests/node_tests/ui_init.js

@@ -107,7 +107,6 @@ zrequire('search_suggestion');
 zrequire('search');
 zrequire('tutorial');
 zrequire('notifications');
-zrequire('pointer');
 zrequire('pm_conversations');
 zrequire('pm_list');
 zrequire('list_cursor');

static/js/bundles/app.js

@@ -110,7 +110,6 @@ import "../info_overlay.js";
 import "../ui.js";
 import "../night_mode.js";
 import "../ui_util.js";
-import "../pointer.js";
 import "../click_handlers.js";
 import "../settings_panel_menu.js";
 import "../settings_toggle.js";

static/js/message_scroll.js

@@ -158,6 +158,26 @@ exports.initialize = function () {
         unread_ops.process_visible();
         scroll_finish();
     }, 50));
+
+    // Scroll handler that marks messages as read when you scroll past them.
+    $(document).on('message_selected.zulip', function (event) {
+        if (event.id === -1) {
+            return;
+        }
+
+        if (event.mark_read && event.previously_selected !== -1) {
+            // Mark messages between old pointer and new pointer as read
+            let messages;
+            if (event.id < event.previously_selected) {
+                messages = event.msg_list.message_range(event.id, event.previously_selected);
+            } else {
+                messages = event.msg_list.message_range(event.previously_selected, event.id);
+            }
+            if (event.msg_list.can_mark_messages_read()) {
+                unread_ops.notify_server_messages_read(messages, {from: 'pointer'});
+            }
+        }
+    });
 };
 
 

static/js/pointer.js

@@ -1,25 +0,0 @@
-// See https://zulip.readthedocs.io/en/latest/subsystems/pointer.html for notes on
-// how this system is designed.
-
-exports.initialize = function initialize() {
-    $(document).on('message_selected.zulip', function (event) {
-        if (event.id === -1) {
-            return;
-        }
-
-        if (event.mark_read && event.previously_selected !== -1) {
-            // Mark messages between old pointer and new pointer as read
-            let messages;
-            if (event.id < event.previously_selected) {
-                messages = event.msg_list.message_range(event.id, event.previously_selected);
-            } else {
-                messages = event.msg_list.message_range(event.previously_selected, event.id);
-            }
-            if (event.msg_list.can_mark_messages_read()) {
-                unread_ops.notify_server_messages_read(messages, {from: 'pointer'});
-            }
-        }
-    });
-};
-
-window.pointer = exports;

static/js/ui_init.js

@@ -471,7 +471,6 @@ exports.initialize_everything = function () {
     settings_sections.initialize();
     settings_toggle.initialize();
     hashchange.initialize();
-    pointer.initialize();
     unread_ui.initialize();
     presence.initialize(presence_params);
     activity.initialize();

tools/test-js-with-node

@@ -92,7 +92,6 @@ EXEMPT_FILES = {
     'static/js/page_params.js',
     'static/js/panels.js',
     'static/js/pm_list_dom.js',
-    'static/js/pointer.js',
     'static/js/poll_widget.js',
     'static/js/popovers.js',
     'static/js/ready.js',