Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Tim Abbott 2018-12-17 12:28:25 -08:00
parent c87a533b3b
commit 12b3e79661
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc.json
View File

@ -141,7 +141,7 @@
"settings_bots": false, "settings_bots": false,
"settings_display": false, "settings_display": false,
"settings_emoji": false, "settings_emoji": false,
"settings_filters": false, "settings_linkifiers": false,
"settings_invites": false, "settings_invites": false,
"settings_muting": false, "settings_muting": false,
"settings_notifications": false, "settings_notifications": false,

2
frontend_tests/node_tests/dispatch.js
View File

@ -973,7 +973,7 @@ with_overrides(function (override) {
// realm_filters // realm_filters
var event = event_fixtures.realm_filters; var event = event_fixtures.realm_filters;
page_params.realm_filters = []; page_params.realm_filters = [];
override('settings_filters.populate_filters', noop); override('settings_linkifiers.populate_filters', noop);
dispatch(event); dispatch(event);
assert_same(page_params.realm_filters, event.realm_filters); assert_same(page_params.realm_filters, event.realm_filters);

2
frontend_tests/node_tests/user_events.js
View File

@ -7,7 +7,7 @@ set_global('activity', {
redraw: function () {}, redraw: function () {},
}); });
set_global('settings_filters', { set_global('settings_linkifiers', {
maybe_disable_widgets: function () {}, maybe_disable_widgets: function () {},
}); });
set_global('settings_org', { set_global('settings_org', {

2
static/js/bundles/app.js
View File

@ -178,7 +178,7 @@ import "js/settings_emoji.js";
import "js/settings_org.js"; import "js/settings_org.js";
import "js/settings_users.js"; import "js/settings_users.js";
import "js/settings_streams.js"; import "js/settings_streams.js";
import "js/settings_filters.js"; import "js/settings_linkifiers.js";
import "js/settings_invites.js"; import "js/settings_invites.js";
import "js/settings_user_groups.js"; import "js/settings_user_groups.js";
import "js/settings_profile_fields.js"; import "js/settings_profile_fields.js";

2
static/js/server_events_dispatch.js
View File

@ -198,7 +198,7 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) {
case 'realm_filters': case 'realm_filters':
page_params.realm_filters = event.realm_filters; page_params.realm_filters = event.realm_filters;
markdown.set_realm_filters(page_params.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; break;
case 'realm_domains': case 'realm_domains':

6
static/js/settings_filters.js → static/js/settings_linkifiers.js
View File

@ -1,4 +1,4 @@
var settings_filters = (function () { var settings_linkifiers = (function () {
var exports = {}; var exports = {};
@ -126,6 +126,6 @@ return exports;
}()); }());
if (typeof module !== 'undefined') { if (typeof module !== 'undefined') {
module.exports = settings_filters; module.exports = settings_linkifiers;
} }
window.settings_filters = settings_filters; window.settings_linkifiers = settings_linkifiers;

4
static/js/settings_sections.js
View File

@ -40,7 +40,7 @@ exports.initialize = function () {
load_func_dict.set('org_users', settings_users.set_up); load_func_dict.set('org_users', settings_users.set_up);
load_func_dict.set('emoji-settings', settings_emoji.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('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('invites-list-admin', settings_invites.set_up);
load_func_dict.set('user-groups-admin', settings_user_groups.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); 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 () { exports.reset_sections = function () {
is_loaded.clear(); is_loaded.clear();
settings_emoji.reset(); settings_emoji.reset();
settings_filters.reset(); settings_linkifiers.reset();
settings_invites.reset(); settings_invites.reset();
settings_org.reset(); settings_org.reset();
settings_profile_fields.reset(); settings_profile_fields.reset();

2
static/js/user_events.js
View File

@ -58,7 +58,7 @@ exports.update_person = function update(person) {
if (people.is_my_user_id(person.user_id)) { if (people.is_my_user_id(person.user_id)) {
page_params.is_admin = person.is_admin; page_params.is_admin = person.is_admin;
gear_menu.update_org_settings_menu_item(); gear_menu.update_org_settings_menu_item();
settings_filters.maybe_disable_widgets(); settings_linkifiers.maybe_disable_widgets();
settings_org.maybe_disable_widgets(); settings_org.maybe_disable_widgets();
settings_profile_fields.maybe_disable_widgets(); settings_profile_fields.maybe_disable_widgets();
settings_streams.maybe_disable_widgets(); settings_streams.maybe_disable_widgets();