paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Rename variables that conflict with muting modules rename.

Browse Source
This commit is contained in:
Priyank Patel
2021-06-30 17:26:14 +00:00
committed by Tim Abbott
parent 88b83de5bd
commit 4dac12144d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/muting.js
View File

@@ -120,9 +120,9 @@ test("get_mutes", () => {
assert.deepEqual(muting.get_muted_topics(), []); assert.deepEqual(muting.get_muted_topics(), []);
muting.add_muted_topic(office.stream_id, "gossip", 1577836800); muting.add_muted_topic(office.stream_id, "gossip", 1577836800);
muting.add_muted_topic(devel.stream_id, "java", 1577836700); muting.add_muted_topic(devel.stream_id, "java", 1577836700);
const muted_topics = muting.get_muted_topics().sort((a, b) => a.date_muted - b.date_muted); const all_muted_topics = muting.get_muted_topics().sort((a, b) => a.date_muted - b.date_muted);
assert.deepEqual(muted_topics, [ assert.deepEqual(all_muted_topics, [
{ {
date_muted: 1577836700000, date_muted: 1577836700000,
date_muted_str: "Dec\u00A031,\u00A02019", date_muted_str: "Dec\u00A031,\u00A02019",

4
static/js/settings_muted_topics.js
View File

@@ -10,11 +10,11 @@ import * as ui from "./ui";
export let loaded = false; export let loaded = false;
export function populate_list() { export function populate_list() {
const muted_topics = muting.get_muted_topics(); const all_muted_topics = muting.get_muted_topics();
const muted_topics_table = $("#muted_topics_table"); const muted_topics_table = $("#muted_topics_table");
const $search_input = $("#muted_topics_search"); const $search_input = $("#muted_topics_search");
ListWidget.create(muted_topics_table, muted_topics, { ListWidget.create(muted_topics_table, all_muted_topics, {
name: "muted-topics-list", name: "muted-topics-list",
modifier(muted_topics) { modifier(muted_topics) {
return render_muted_topic_ui_row({muted_topics}); return render_muted_topic_ui_row({muted_topics});

4
static/js/settings_muted_users.js
View File

@@ -11,7 +11,7 @@ import * as ui from "./ui";
export let loaded = false; export let loaded = false;
export function populate_list() { export function populate_list() {
const muted_users = muting.get_muted_users().map((user) => ({ const all_muted_users = muting.get_muted_users().map((user) => ({
user_id: user.id, user_id: user.id,
user_name: people.get_full_name(user.id), user_name: people.get_full_name(user.id),
date_muted_str: user.date_muted_str, date_muted_str: user.date_muted_str,
@@ -19,7 +19,7 @@ export function populate_list() {
const muted_users_table = $("#muted_users_table"); const muted_users_table = $("#muted_users_table");
const $search_input = $("#muted_users_search"); const $search_input = $("#muted_users_search");
ListWidget.create(muted_users_table, muted_users, { ListWidget.create(muted_users_table, all_muted_users, {
name: "muted-users-list", name: "muted-users-list",
modifier(muted_users) { modifier(muted_users) {
return render_muted_user_ui_row({muted_users}); return render_muted_user_ui_row({muted_users});