diff --git a/.eslintrc.json b/.eslintrc.json index f071afa59d..9899939c6f 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -212,7 +212,6 @@ "padded_widget": false, "page_params": false, "panels": false, - "pill_typeahead": false, "pm_list": false, "pm_list_dom": false, "pointer": false, diff --git a/frontend_tests/node_tests/settings_user_groups.js b/frontend_tests/node_tests/settings_user_groups.js index d72613503f..fe53bf28ae 100644 --- a/frontend_tests/node_tests/settings_user_groups.js +++ b/frontend_tests/node_tests/settings_user_groups.js @@ -10,7 +10,6 @@ const {run_test} = require("../zjsunit/test"); const {make_zjquery} = require("../zjsunit/zjquery"); const user_pill = zrequire("user_pill"); -zrequire("pill_typeahead"); const settings_user_groups = zrequire("settings_user_groups"); set_global("$", make_zjquery()); diff --git a/frontend_tests/node_tests/stream_edit.js b/frontend_tests/node_tests/stream_edit.js index 086a0afa01..4549311a5b 100644 --- a/frontend_tests/node_tests/stream_edit.js +++ b/frontend_tests/node_tests/stream_edit.js @@ -38,7 +38,6 @@ set_global("$", make_zjquery()); zrequire("input_pill"); const peer_data = zrequire("peer_data"); const people = zrequire("people"); -zrequire("pill_typeahead"); zrequire("subs"); const stream_edit = zrequire("stream_edit"); const stream_data = zrequire("stream_data"); diff --git a/frontend_tests/node_tests/user_pill.js b/frontend_tests/node_tests/user_pill.js index e8b676be01..bd45e83c54 100644 --- a/frontend_tests/node_tests/user_pill.js +++ b/frontend_tests/node_tests/user_pill.js @@ -7,7 +7,6 @@ const {run_test} = require("../zjsunit/test"); const people = zrequire("people"); const user_pill = zrequire("user_pill"); -zrequire("pill_typeahead"); set_global("page_params", {}); diff --git a/static/js/bundles/app.js b/static/js/bundles/app.js index 599879d075..1fbeb72aa3 100644 --- a/static/js/bundles/app.js +++ b/static/js/bundles/app.js @@ -95,7 +95,6 @@ import "../typeahead_helper"; import "../search_suggestion"; import "../search"; import "../composebox_typeahead"; -import "../pill_typeahead"; import "../navigate"; import "../list_util"; import "../hotkey"; diff --git a/static/js/global.d.ts b/static/js/global.d.ts index ae3b46925a..d01cf00bca 100644 --- a/static/js/global.d.ts +++ b/static/js/global.d.ts @@ -81,7 +81,6 @@ declare let overlays: any; declare let padded_widget: any; declare let page_params: any; declare let panels: any; -declare let pill_typeahead: any; declare let pm_list: any; declare let pointer: any; declare let poll_widget: any; diff --git a/static/js/pill_typeahead.js b/static/js/pill_typeahead.js index 2f2e98bd36..01d188169e 100644 --- a/static/js/pill_typeahead.js +++ b/static/js/pill_typeahead.js @@ -1,10 +1,8 @@ -"use strict"; +import * as people from "./people"; +import * as settings_data from "./settings_data"; +import * as stream_pill from "./stream_pill"; -const people = require("./people"); -const settings_data = require("./settings_data"); -const stream_pill = require("./stream_pill"); - -exports.set_up = function (input, pills, opts) { +export function set_up(input, pills, opts) { let source = opts.source; if (!opts.source) { source = () => user_pill.typeahead_source(pills); @@ -67,6 +65,4 @@ exports.set_up = function (input, pills, opts) { }, stopAdvance: true, }); -}; - -window.pill_typeahead = exports; +} diff --git a/static/js/settings_account.js b/static/js/settings_account.js index d70a3cb361..65a76415eb 100644 --- a/static/js/settings_account.js +++ b/static/js/settings_account.js @@ -7,6 +7,7 @@ const render_settings_custom_user_profile_field = require("../templates/settings const render_settings_dev_env_email_access = require("../templates/settings/dev_env_email_access.hbs"); const people = require("./people"); +const pill_typeahead = require("./pill_typeahead"); const setup = require("./setup"); exports.update_email = function (new_email) { diff --git a/static/js/settings_user_groups.js b/static/js/settings_user_groups.js index 9b038b7993..cf3ba1cafc 100644 --- a/static/js/settings_user_groups.js +++ b/static/js/settings_user_groups.js @@ -6,6 +6,7 @@ const render_admin_user_group_list = require("../templates/admin_user_group_list const render_confirm_delete_user = require("../templates/confirm_delete_user.hbs"); const people = require("./people"); +const pill_typeahead = require("./pill_typeahead"); const meta = { loaded: false, diff --git a/static/js/stream_edit.js b/static/js/stream_edit.js index 007ba27325..8fb8d48ca7 100644 --- a/static/js/stream_edit.js +++ b/static/js/stream_edit.js @@ -8,6 +8,7 @@ const render_subscription_stream_privacy_modal = require("../templates/subscript const peer_data = require("./peer_data"); const people = require("./people"); +const pill_typeahead = require("./pill_typeahead"); const settings_config = require("./settings_config"); const settings_data = require("./settings_data"); const stream_pill = require("./stream_pill");