subject -> topic: Rename by_stream_subject_uri.

This commit is contained in:
Steve Howell 2018-11-13 15:34:19 +00:00 committed by Tim Abbott
parent b615f0df4d
commit a172ac264d
3 changed files with 4 additions and 4 deletions

View File

@ -59,7 +59,7 @@ exports.by_stream_uri = function (stream) {
return "#narrow/stream/" + exports.encode_stream_name(stream); return "#narrow/stream/" + exports.encode_stream_name(stream);
}; };
exports.by_stream_subject_uri = function (stream, subject) { exports.by_stream_topic_uri = function (stream, subject) {
return "#narrow/stream/" + exports.encode_stream_name(stream) + return "#narrow/stream/" + exports.encode_stream_name(stream) +
"/subject/" + exports.encodeHashComponent(subject); "/subject/" + exports.encodeHashComponent(subject);
}; };
@ -115,7 +115,7 @@ exports.by_conversation_and_time_uri = function (message) {
if (message.type === "stream") { if (message.type === "stream") {
return absolute_url + return absolute_url +
exports.by_stream_subject_uri(message.stream, message.subject) + exports.by_stream_topic_uri(message.stream, message.subject) +
suffix; suffix;
} }

View File

@ -237,7 +237,7 @@ MessageListView.prototype = {
message_container.stream_url = message_container.stream_url =
hash_util.by_stream_uri(message_container.msg.stream); hash_util.by_stream_uri(message_container.msg.stream);
message_container.topic_url = message_container.topic_url =
hash_util.by_stream_subject_uri( hash_util.by_stream_topic_uri(
message_container.msg.stream, message_container.msg.stream,
message_container.msg.subject); message_container.msg.subject);
} else { } else {

View File

@ -87,7 +87,7 @@ exports.widget = function (parent_elem, my_stream_id) {
unread: num_unread, unread: num_unread,
is_zero: num_unread === 0, is_zero: num_unread === 0,
is_muted: muting.is_topic_muted(my_stream_name, topic_name), is_muted: muting.is_topic_muted(my_stream_name, topic_name),
url: hash_util.by_stream_subject_uri(my_stream_name, topic_name), url: hash_util.by_stream_topic_uri(my_stream_name, topic_name),
}; };
var li = $(templates.render('topic_list_item', topic_info)); var li = $(templates.render('topic_list_item', topic_info));
self.topic_items.set(topic_name, li); self.topic_items.set(topic_name, li);