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

list-widget: Rename settings_list_widget => dropdown_list_widget. 

We want to use this widget outside of the settings panels as well.
This commit is contained in:
Rohitt Vashishtha 2020-05-13 00:14:05 +05:30 committed by Tim Abbott
parent 587b5473c2
commit e2b0a4cba1
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc.json
View File

@ -255,6 +255,7 @@
"csrf_token": false, "csrf_token": false,
"current_msg_list": true, "current_msg_list": true,
"drafts": false, "drafts": false,
"dropdown_list_widget": false,
"echo": false, "echo": false,
"emoji": false, "emoji": false,
"emoji_picker": false, "emoji_picker": false,
@ -348,7 +349,6 @@
"settings_display": false, "settings_display": false,
"settings_emoji": false, "settings_emoji": false,
"settings_exports": false, "settings_exports": false,
"settings_list_widget": false,
"settings_linkifiers": false, "settings_linkifiers": false,
"settings_invites": false, "settings_invites": false,
"settings_muting": false, "settings_muting": false,

10
frontend_tests/node_tests/settings_org.js
View File

@ -80,7 +80,7 @@ zrequire('stream_data');
zrequire('settings_account'); zrequire('settings_account');
zrequire('settings_org'); zrequire('settings_org');
zrequire('settings_ui'); zrequire('settings_ui');
zrequire('settings_list_widget'); zrequire('dropdown_list_widget');
run_test('unloaded', () => { run_test('unloaded', () => {
// This test mostly gets us line coverage, and makes // This test mostly gets us line coverage, and makes
@ -795,8 +795,8 @@ run_test('set_up', () => {
upload_realm_icon = f; upload_realm_icon = f;
}; };
const settings_list_widget_backup = settings_list_widget; const dropdown_list_widget_backup = dropdown_list_widget;
settings_list_widget = () => { // eslint-disable-line no-native-reassign dropdown_list_widget = () => { // eslint-disable-line no-native-reassign
return { return {
render: noop, render: noop,
update: noop, update: noop,
@ -840,7 +840,7 @@ run_test('set_up', () => {
test_parse_time_limit(); test_parse_time_limit();
test_discard_changes_button(discard_changes); test_discard_changes_button(discard_changes);
settings_list_widget = settings_list_widget_backup; // eslint-disable-line no-native-reassign dropdown_list_widget = dropdown_list_widget_backup; // eslint-disable-line no-native-reassign
}); });
run_test('test get_organization_settings_options', () => { run_test('test get_organization_settings_options', () => {
@ -1022,7 +1022,7 @@ run_test('misc', () => {
return arr; return arr;
}; };
// Set stubs for settings_list_widget: // Set stubs for dropdown_list_widget:
const widget_settings = ['realm_notifications_stream_id', const widget_settings = ['realm_notifications_stream_id',
'realm_signup_notifications_stream_id', 'realm_signup_notifications_stream_id',
'realm_default_code_block_language']; 'realm_default_code_block_language'];

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

@ -163,7 +163,7 @@ import "../realm_icon.js";
import "../realm_logo.js"; import "../realm_logo.js";
import "../reminder.js"; import "../reminder.js";
import "../confirm_dialog.js"; import "../confirm_dialog.js";
import "../settings_list_widget.js"; import "../dropdown_list_widget.js";
import "../settings_account.js"; import "../settings_account.js";
import "../settings_display.js"; import "../settings_display.js";
import "../settings_notifications.js"; import "../settings_notifications.js";

2
static/js/settings_list_widget.js → static/js/dropdown_list_widget.js
View File

@ -120,4 +120,4 @@ const DropdownListWidget = function (opts) {
}; };
}; };
window.settings_list_widget = DropdownListWidget; window.dropdown_list_widget = DropdownListWidget;

6
static/js/settings_org.js
View File

@ -556,13 +556,13 @@ exports.init_dropdown_widgets = () => {
render_text: (x) => {return `#${x}`;}, render_text: (x) => {return `#${x}`;},
null_value: -1, null_value: -1,
}; };
exports.notifications_stream_widget = settings_list_widget( exports.notifications_stream_widget = dropdown_list_widget(
Object.assign({setting_name: 'realm_notifications_stream_id'}, Object.assign({setting_name: 'realm_notifications_stream_id'},
notification_stream_options)); notification_stream_options));
exports.signup_notifications_stream_widget = settings_list_widget( exports.signup_notifications_stream_widget = dropdown_list_widget(
Object.assign({setting_name: 'realm_signup_notifications_stream_id'}, Object.assign({setting_name: 'realm_signup_notifications_stream_id'},
notification_stream_options)); notification_stream_options));
exports.default_code_language_widget = settings_list_widget({ exports.default_code_language_widget = dropdown_list_widget({
setting_name: 'realm_default_code_block_language', setting_name: 'realm_default_code_block_language',
data: Object.keys(pygments_data.langs).map(x => { data: Object.keys(pygments_data.langs).map(x => {
return { return {

2
tools/test-js-with-node
View File

@ -107,7 +107,7 @@ EXEMPT_FILES = {
'static/js/search_pill_widget.js', 'static/js/search_pill_widget.js',
'static/js/sent_messages.js', 'static/js/sent_messages.js',
'static/js/server_events.js', 'static/js/server_events.js',
'static/js/settings_list_widget.js', 'static/js/dropdown_list_widget.js',
'static/js/settings_account.js', 'static/js/settings_account.js',
'static/js/settings_bots.js', 'static/js/settings_bots.js',
'static/js/settings_config.js', 'static/js/settings_config.js',