diff --git a/.eslintrc.json b/.eslintrc.json index 0eb462688e..24a96bcab9 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -271,7 +271,6 @@ "topic_list": false, "transmit": false, "typeahead_helper": false, - "typing": false, "typing_data": false, "typing_events": false, "ui": false, diff --git a/frontend_tests/node_tests/ui_init.js b/frontend_tests/node_tests/ui_init.js index 77ec4aac5a..79bb3b371f 100644 --- a/frontend_tests/node_tests/ui_init.js +++ b/frontend_tests/node_tests/ui_init.js @@ -114,7 +114,6 @@ zrequire("keydown_util"); zrequire("stream_list"); zrequire("topic_list"); zrequire("sent_messages"); -zrequire("typing"); zrequire("top_left_corner"); zrequire("starred_messages"); diff --git a/static/js/bundles/app.js b/static/js/bundles/app.js index e39f8229d6..da3a324a7f 100644 --- a/static/js/bundles/app.js +++ b/static/js/bundles/app.js @@ -147,7 +147,6 @@ import "../admin"; import "../message_view_header"; import "../bot_data"; import "../reactions"; -import "../typing"; import "../typing_data"; import "../typing_events"; import "../ui_init"; diff --git a/static/js/global.d.ts b/static/js/global.d.ts index bc756c3efe..cdf9565b03 100644 --- a/static/js/global.d.ts +++ b/static/js/global.d.ts @@ -137,7 +137,6 @@ declare let topic_list: any; declare let top_left_corner: any; declare let transmit: any; declare let typeahead_helper: any; -declare let typing: any; declare let typing_data: any; declare let typing_events: any; declare let ui: any; diff --git a/static/js/typing.js b/static/js/typing.js index 830442dc8b..37dc14a066 100644 --- a/static/js/typing.js +++ b/static/js/typing.js @@ -1,8 +1,6 @@ -"use strict"; +import * as typing_status from "../shared/js/typing_status"; -const typing_status = require("../shared/js/typing_status"); - -const people = require("./people"); +import * as people from "./people"; // This module handles the outbound side of typing indicators. // We detect changes in the compose box and notify the server @@ -54,8 +52,9 @@ function notify_server_stop(user_ids_array) { send_typing_notification_ajax(user_ids_array, "stop"); } -exports.get_recipient = get_user_ids_array; -exports.initialize = function () { +export const get_recipient = get_user_ids_array; + +export function initialize() { const worker = { get_current_time, notify_server_start, @@ -65,7 +64,7 @@ exports.initialize = function () { $(document).on("input", "#compose-textarea", () => { // If our previous state was no typing notification, send a // start-typing notice immediately. - const new_recipient = is_valid_conversation() ? exports.get_recipient() : null; + const new_recipient = is_valid_conversation() ? get_recipient() : null; typing_status.update(worker, new_recipient); }); @@ -74,6 +73,4 @@ exports.initialize = function () { $(document).on("compose_canceled.zulip compose_finished.zulip", () => { typing_status.update(worker, null); }); -}; - -window.typing = exports; +} diff --git a/static/js/ui_init.js b/static/js/ui_init.js index de516a6ea4..67fabe5eb8 100644 --- a/static/js/ui_init.js +++ b/static/js/ui_init.js @@ -18,6 +18,7 @@ const people = require("./people"); const pm_conversations = require("./pm_conversations"); const topic_zoom = require("./topic_zoom"); const tutorial = require("./tutorial"); +const typing = require("./typing"); const user_status = require("./user_status"); const user_status_ui = require("./user_status_ui");