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

Add narrow_state.stream_sub() and narrow_state.stream_id().

Browse Source
This commit is contained in:
Steve Howell
2018-05-02 11:51:02 +00:00
committed by Tim Abbott
parent 0232e92038
commit a62c85c015
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend_tests/node_tests/narrow_state.js
View File

@@ -37,6 +37,7 @@ function set_filter(operators) {
assert(narrow_state.active()); assert(narrow_state.active());
assert.equal(narrow_state.stream(), 'Test'); assert.equal(narrow_state.stream(), 'Test');
assert.equal(narrow_state.stream_id(), test_stream.stream_id);
assert.equal(narrow_state.topic(), 'Bar'); assert.equal(narrow_state.topic(), 'Bar');
assert(narrow_state.is_for_stream_id(test_stream.stream_id)); assert(narrow_state.is_for_stream_id(test_stream.stream_id));
@@ -61,6 +62,7 @@ function set_filter(operators) {
assert(!narrow_state.narrowed_to_search()); assert(!narrow_state.narrowed_to_search());
assert(!narrow_state.narrowed_to_topic()); assert(!narrow_state.narrowed_to_topic());
assert(!narrow_state.narrowed_by_stream_reply()); assert(!narrow_state.narrowed_by_stream_reply());
assert.equal(narrow_state.stream_id(), undefined);
set_filter([['stream', 'Foo']]); set_filter([['stream', 'Foo']]);
assert(!narrow_state.narrowed_to_pms()); assert(!narrow_state.narrowed_to_pms());
@@ -200,9 +202,17 @@ function set_filter(operators) {
(function test_stream() { (function test_stream() {
set_filter(undefined); set_filter(undefined);
assert.equal(narrow_state.stream(), undefined); assert.equal(narrow_state.stream(), undefined);
assert.equal(narrow_state.stream_id(), undefined);
set_filter([['stream', 'Foo'], ['topic', 'Bar']]); set_filter([['stream', 'Foo'], ['topic', 'Bar']]);
assert.equal(narrow_state.stream(), 'Foo'); assert.equal(narrow_state.stream(), 'Foo');
assert.equal(narrow_state.stream_sub(), undefined);
assert.equal(narrow_state.stream_id(), undefined);
const sub = {name: 'Foo', stream_id: 55};
stream_data.add_sub('Foo', sub);
assert.equal(narrow_state.stream_id(), 55);
assert.deepEqual(narrow_state.stream_sub(), sub);
set_filter([['sender', 'someone'], ['topic', 'random']]); set_filter([['sender', 'someone'], ['topic', 'random']]);
assert.equal(narrow_state.stream(), undefined); assert.equal(narrow_state.stream(), undefined);

25
static/js/narrow_state.js
View File

@@ -109,6 +109,31 @@ exports.stream = function () {
return; return;
}; };
exports.stream_sub = function () {
if (current_filter === undefined) {
return;
}
var stream_operands = current_filter.operands("stream");
if (stream_operands.length !== 1) {
return;
}
var name = stream_operands[0];
var sub = stream_data.get_sub_by_name(name);
return sub;
};
exports.stream_id = function () {
var sub = exports.stream_sub();
if (!sub) {
return;
}
return sub.stream_id;
};
exports.topic = function () { exports.topic = function () {
if (current_filter === undefined) { if (current_filter === undefined) {
return; return;