From b615f0df4de258c9a18f5ce534fadb086411316f Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Tue, 13 Nov 2018 15:27:16 +0000 Subject: [PATCH] subject -> topic: Fix stream/subject in comments. --- static/js/compose_actions.js | 2 +- static/js/floating_recipient_bar.js | 4 ++-- static/js/narrow_state.js | 2 +- static/js/tab_bar.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/static/js/compose_actions.js b/static/js/compose_actions.js index 9b162ffe6b..17bb40e908 100644 --- a/static/js/compose_actions.js +++ b/static/js/compose_actions.js @@ -225,7 +225,7 @@ exports.start = function (msg_type, opts) { compose_state.recipient(opts.private_message_recipient.replace(/,\s*/g, ", ")); // If the user opens the compose box, types some text, and then clicks on a - // different stream/subject, we want to keep the text in the compose box + // different stream/topic, we want to keep the text in the compose box if (opts.content !== undefined) { compose_state.message_content(opts.content); } diff --git a/static/js/floating_recipient_bar.js b/static/js/floating_recipient_bar.js index 1d3cddb082..01d1528006 100644 --- a/static/js/floating_recipient_bar.js +++ b/static/js/floating_recipient_bar.js @@ -85,10 +85,10 @@ exports.update = function () { } var current_label = candidate; - // We now know what the floating stream/subject bar should say. + // We now know what the floating stream/topic bar should say. // Do we show it? - // Hide if the bottom of our floating stream/subject label is not + // Hide if the bottom of our floating stream/topic label is not // lower than the bottom of current_label (since that means we're // covering up a label that already exists). var header_height = $(current_label).find('.message_header').safeOuterHeight(); diff --git a/static/js/narrow_state.js b/static/js/narrow_state.js index a6b93bdb41..4112daaf49 100644 --- a/static/js/narrow_state.js +++ b/static/js/narrow_state.js @@ -314,7 +314,7 @@ exports.narrowed_by_topic_reply = function () { }; // We auto-reply under certain conditions, namely when you're narrowed -// to a PM (or huddle), and when you're narrowed to some stream/subject pair +// to a PM (or huddle), and when you're narrowed to some stream/topic pair exports.narrowed_by_reply = function () { return exports.narrowed_by_pm_reply() || exports.narrowed_by_topic_reply(); diff --git a/static/js/tab_bar.js b/static/js/tab_bar.js index 3e7fc1f707..539b13f527 100644 --- a/static/js/tab_bar.js +++ b/static/js/tab_bar.js @@ -99,7 +99,7 @@ function make_tab_data() { tabs.push(make_tab("Search results", false)); } - // Third breadcrumb item for stream-subject naarrows + // Third breadcrumb item for stream-topic naarrows if (filter.has_operator("stream") && filter.has_operator("topic")) { var subject = filter.operands("topic")[0];