From e79e74ade4e68f2e6abbc3ca7aab9988eef85ee7 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Wed, 18 Sep 2013 13:27:12 -0400 Subject: [PATCH] Add narrowed_to_topic() helper function. (imported from commit 9190caa9b183893fb7ae883686b9bdbd661d5895) --- static/js/narrow.js | 8 ++++++++ zerver/tests/frontend/node/narrow.js | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/static/js/narrow.js b/static/js/narrow.js index 49777b170b..676d8e0107 100644 --- a/static/js/narrow.js +++ b/static/js/narrow.js @@ -435,6 +435,14 @@ exports.narrowed_by_reply = function () { current_filter.operands("topic").length === 1)); }; +exports.narrowed_to_topic = function () { + if (current_filter === undefined) { + return false; + } + return (current_filter.has_operator("stream") && + current_filter.has_operator("topic")); +}; + exports.narrowed_to_search = function () { return (current_filter !== undefined) && current_filter.is_search(); }; diff --git a/zerver/tests/frontend/node/narrow.js b/zerver/tests/frontend/node/narrow.js index a360dae604..eef883aafe 100644 --- a/zerver/tests/frontend/node/narrow.js +++ b/zerver/tests/frontend/node/narrow.js @@ -27,26 +27,31 @@ function set_filter(operators) { assert(!narrow.narrowed_to_pms()); assert(!narrow.narrowed_by_reply()); assert(!narrow.narrowed_to_search()); + assert(!narrow.narrowed_to_topic()); set_filter([['stream', 'Foo']]); assert(!narrow.narrowed_to_pms()); assert(!narrow.narrowed_by_reply()); assert(!narrow.narrowed_to_search()); + assert(!narrow.narrowed_to_topic()); set_filter([['pm-with', 'steve@zulip.com']]); assert(narrow.narrowed_to_pms()); assert(narrow.narrowed_by_reply()); assert(!narrow.narrowed_to_search()); + assert(!narrow.narrowed_to_topic()); set_filter([['stream', 'Foo'], ['topic', 'bar']]); assert(!narrow.narrowed_to_pms()); assert(narrow.narrowed_by_reply()); assert(!narrow.narrowed_to_search()); + assert(narrow.narrowed_to_topic()); set_filter([['search', 'grail']]); assert(!narrow.narrowed_to_pms()); assert(!narrow.narrowed_by_reply()); assert(narrow.narrowed_to_search()); + assert(!narrow.narrowed_to_topic()); }()); (function test_operators() {