paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 14:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify rendering of "more topics" link.

Browse Source 
We now use a template to render the "more topics" link.

We also remove an unnecessary conditional and an unnecessary
attribute.

Finally, our unit tests are a bit more granular now.
This commit is contained in:
Steve Howell
2017-09-21 11:44:31 -07:00
committed by Tim Abbott
parent 544bbab480
commit 490935249c
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend_tests/node_tests/templates.js
View File

@@ -828,6 +828,13 @@ function render(template_name, args) {
assert($(html).find(".message_reaction").has(".emoji .emoji-smile")); assert($(html).find(".message_reaction").has(".emoji .emoji-smile"));
}()); }());
(function more_topics() {
var html = render('more_topics');
global.write_handlebars_output("more_topics", html);
assert($(html).hasClass('show-more-topics'));
}());
(function new_stream_users() { (function new_stream_users() {
var args = { var args = {
users: [ users: [

11
frontend_tests/node_tests/topic_list.js
View File

@@ -82,7 +82,13 @@ zrequire('topic_list');
assert.equal(topic_list.active_stream_id(), undefined); assert.equal(topic_list.active_stream_id(), undefined);
var widget = topic_list.rebuild(parent_elem, stream_id); var widget = topic_list.widget(parent_elem, stream_id);
widget.build_more_topics_section = function () {
return $('<more topics>');
};
widget.build();
assert(widget.is_for_stream(stream_id)); assert(widget.is_for_stream(stream_id));
assert.equal(widget.get_parent(), parent_elem); assert.equal(widget.get_parent(), parent_elem);
@@ -90,8 +96,7 @@ zrequire('topic_list');
assert(checked_mutes); assert(checked_mutes);
assert(rendered); assert(rendered);
assert.equal(list_items[0].html(), '<topic list item>'); assert.equal(list_items[0].html(), '<topic list item>');
assert.equal(list_items[1], $('<li class="show-more-topics">')); assert.equal(list_items[1].html(), '<more topics>');
assert(attached_to_parent); assert(attached_to_parent);
assert.equal(topic_list.active_stream_id(), stream_id);
}()); }());

21
static/js/topic_list.js
View File

@@ -94,22 +94,17 @@ exports.widget = function (parent_elem, my_stream_id) {
ul.append(li); ul.append(li);
}); });
// We should actually only show more topics when we're zoomed out, although var show_more = self.build_more_topics_section();
// CSS makes this fine for now. ul.append(show_more);
var show_more_topics_link = true;
if (show_more_topics_link) {
var show_more = $('<li class="show-more-topics">');
show_more.attr('data-stream', my_stream_name);
var link = $('<a href="#">');
link.html(i18n.t('more topics'));
show_more.html(link);
ul.append(show_more);
}
return ul; return ul;
}; };
self.build_more_topics_section = function () {
var show_more_html = templates.render('more_topics');
return $(show_more_html);
};
self.get_parent = function () { self.get_parent = function () {
return parent_elem; return parent_elem;
}; };
@@ -180,8 +175,6 @@ exports.rebuild = function (stream_li, stream_id) {
exports.remove_expanded_topics(); exports.remove_expanded_topics();
active_widget = exports.widget(stream_li, stream_id); active_widget = exports.widget(stream_li, stream_id);
active_widget.build(active_topic); active_widget.build(active_topic);
return active_widget; // used for testing
}; };
// For zooming, we only do topic-list stuff here...let stream_list // For zooming, we only do topic-list stuff here...let stream_list

3
static/templates/more_topics.handlebars Normal file
View File

@@ -0,0 +1,3 @@
<li class="show-more-topics">
<a href="#">{{t "more topics" }}</a>
</li>