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

muting: Use stream_id as arg for notify_with_undo_option.

Browse Source 
Also remove the unused meta.stream and meta.topic variables.
This commit is contained in:
Steve Howell
2018-12-13 22:23:50 +00:00
committed by Tim Abbott
parent ba04ec7e85
commit 10b045f91b
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
static/js/muting_ui.js
View File

@@ -25,8 +25,6 @@ exports.rerender = function () {
exports.notify_with_undo_option = (function () { exports.notify_with_undo_option = (function () {
var meta = { var meta = {
stream: null,
topic: null,
hide_me_time: null, hide_me_time: null,
alert_hover_state: false, alert_hover_state: false,
$mute: null, $mute: null,
@@ -49,7 +47,9 @@ exports.notify_with_undo_option = (function () {
} }
}, 100); }, 100);
return function (stream, topic) { return function (stream_id, topic) {
var stream_name = stream_data.maybe_get_stream_name(stream_id);
var $exit = $("#unmute_muted_topic_notification .exit-me"); var $exit = $("#unmute_muted_topic_notification .exit-me");
if (!meta.$mute) { if (!meta.$mute) {
@@ -62,18 +62,16 @@ exports.notify_with_undo_option = (function () {
meta.$mute.find("#unmute").click(function () { meta.$mute.find("#unmute").click(function () {
// it should reference the meta variable and not get stuck with // it should reference the meta variable and not get stuck with
// a pass-by-value of stream, topic. // a pass-by-value of stream, topic.
exports.unmute(meta.stream, meta.topic); exports.unmute(stream_name, topic);
animate.fadeOut(); animate.fadeOut();
}); });
} }
meta.stream = stream;
meta.topic = topic;
// add a four second delay before closing up. // add a four second delay before closing up.
meta.hide_me_time = new Date().getTime() + 4000; meta.hide_me_time = new Date().getTime() + 4000;
meta.$mute.find(".stream").text(stream_name);
meta.$mute.find(".topic").text(topic); meta.$mute.find(".topic").text(topic);
meta.$mute.find(".stream").text(stream);
animate.fadeIn(); animate.fadeIn();
@@ -180,7 +178,7 @@ exports.mute = function (stream, topic) {
unread_ui.update_unread_counts(); unread_ui.update_unread_counts();
exports.rerender(); exports.rerender();
exports.persist_mute(stream_id, topic); exports.persist_mute(stream_id, topic);
exports.notify_with_undo_option(stream, topic); exports.notify_with_undo_option(stream_id, topic);
exports.set_up_muted_topics_ui(muting.get_muted_topics()); exports.set_up_muted_topics_ui(muting.get_muted_topics());
}; };