From 12b3e79661ab5707da0fbda79d187cfafc0d4ae8 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Mon, 17 Dec 2018 12:28:25 -0800 Subject: [PATCH] settings: Rename "settings_filters" to "settings_linkifiers". This makes the JS codebase match the UI for how to describe this feature. No user-facing effect. --- .eslintrc.json | 2 +- frontend_tests/node_tests/dispatch.js | 2 +- frontend_tests/node_tests/user_events.js | 2 +- static/js/bundles/app.js | 2 +- static/js/server_events_dispatch.js | 2 +- static/js/{settings_filters.js => settings_linkifiers.js} | 6 +++--- static/js/settings_sections.js | 4 ++-- static/js/user_events.js | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename static/js/{settings_filters.js => settings_linkifiers.js} (96%) diff --git a/.eslintrc.json b/.eslintrc.json index 457a688714..1c03103bbc 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -141,7 +141,7 @@ "settings_bots": false, "settings_display": false, "settings_emoji": false, - "settings_filters": false, + "settings_linkifiers": false, "settings_invites": false, "settings_muting": false, "settings_notifications": false, diff --git a/frontend_tests/node_tests/dispatch.js b/frontend_tests/node_tests/dispatch.js index e3a48cf60e..4a32ad3c95 100644 --- a/frontend_tests/node_tests/dispatch.js +++ b/frontend_tests/node_tests/dispatch.js @@ -973,7 +973,7 @@ with_overrides(function (override) { // realm_filters var event = event_fixtures.realm_filters; page_params.realm_filters = []; - override('settings_filters.populate_filters', noop); + override('settings_linkifiers.populate_filters', noop); dispatch(event); assert_same(page_params.realm_filters, event.realm_filters); diff --git a/frontend_tests/node_tests/user_events.js b/frontend_tests/node_tests/user_events.js index d4293e51ca..017335f100 100644 --- a/frontend_tests/node_tests/user_events.js +++ b/frontend_tests/node_tests/user_events.js @@ -7,7 +7,7 @@ set_global('activity', { redraw: function () {}, }); -set_global('settings_filters', { +set_global('settings_linkifiers', { maybe_disable_widgets: function () {}, }); set_global('settings_org', { diff --git a/static/js/bundles/app.js b/static/js/bundles/app.js index ef3dd31bcb..0eac14b8c5 100644 --- a/static/js/bundles/app.js +++ b/static/js/bundles/app.js @@ -178,7 +178,7 @@ import "js/settings_emoji.js"; import "js/settings_org.js"; import "js/settings_users.js"; import "js/settings_streams.js"; -import "js/settings_filters.js"; +import "js/settings_linkifiers.js"; import "js/settings_invites.js"; import "js/settings_user_groups.js"; import "js/settings_profile_fields.js"; diff --git a/static/js/server_events_dispatch.js b/static/js/server_events_dispatch.js index d487acae0a..68979924ef 100644 --- a/static/js/server_events_dispatch.js +++ b/static/js/server_events_dispatch.js @@ -198,7 +198,7 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) { case 'realm_filters': page_params.realm_filters = event.realm_filters; markdown.set_realm_filters(page_params.realm_filters); - settings_filters.populate_filters(page_params.realm_filters); + settings_linkifiers.populate_filters(page_params.realm_filters); break; case 'realm_domains': diff --git a/static/js/settings_filters.js b/static/js/settings_linkifiers.js similarity index 96% rename from static/js/settings_filters.js rename to static/js/settings_linkifiers.js index 4a5b6198ef..ea8ba80d1a 100644 --- a/static/js/settings_filters.js +++ b/static/js/settings_linkifiers.js @@ -1,4 +1,4 @@ -var settings_filters = (function () { +var settings_linkifiers = (function () { var exports = {}; @@ -126,6 +126,6 @@ return exports; }()); if (typeof module !== 'undefined') { - module.exports = settings_filters; + module.exports = settings_linkifiers; } -window.settings_filters = settings_filters; +window.settings_linkifiers = settings_linkifiers; diff --git a/static/js/settings_sections.js b/static/js/settings_sections.js index cfbc4dc4f0..7c32b77b7d 100644 --- a/static/js/settings_sections.js +++ b/static/js/settings_sections.js @@ -40,7 +40,7 @@ exports.initialize = function () { load_func_dict.set('org_users', settings_users.set_up); load_func_dict.set('emoji-settings', settings_emoji.set_up); load_func_dict.set('default-streams-list', settings_streams.set_up); - load_func_dict.set('filter-settings', settings_filters.set_up); + load_func_dict.set('filter-settings', settings_linkifiers.set_up); load_func_dict.set('invites-list-admin', settings_invites.set_up); load_func_dict.set('user-groups-admin', settings_user_groups.set_up); load_func_dict.set('profile-field-settings', settings_profile_fields.set_up); @@ -70,7 +70,7 @@ exports.load_settings_section = function (section) { exports.reset_sections = function () { is_loaded.clear(); settings_emoji.reset(); - settings_filters.reset(); + settings_linkifiers.reset(); settings_invites.reset(); settings_org.reset(); settings_profile_fields.reset(); diff --git a/static/js/user_events.js b/static/js/user_events.js index 92a5ea636c..2fa56b2a12 100644 --- a/static/js/user_events.js +++ b/static/js/user_events.js @@ -58,7 +58,7 @@ exports.update_person = function update(person) { if (people.is_my_user_id(person.user_id)) { page_params.is_admin = person.is_admin; gear_menu.update_org_settings_menu_item(); - settings_filters.maybe_disable_widgets(); + settings_linkifiers.maybe_disable_widgets(); settings_org.maybe_disable_widgets(); settings_profile_fields.maybe_disable_widgets(); settings_streams.maybe_disable_widgets();