Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Enable conversation narrows (but not single-message narrows) for everyone. 

(imported from commit 48123d77f9f9dc5d858718888dedf763328a9774)
This commit is contained in:
Tim Abbott 2013-11-25 12:37:08 -05:00
parent 8952d8d428
commit 3378fc74c7
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/feature_flags.js
View File

@ -49,7 +49,6 @@ exports.mark_read_at_bottom = true;
exports.propagate_topic_edits = true; exports.propagate_topic_edits = true;
exports.summarize_read_while_narrowed = false; exports.summarize_read_while_narrowed = false;
exports.show_huddles = true; exports.show_huddles = true;
exports.single_message_narrowing = true;
// Ready for deprecation. // Ready for deprecation.
exports.collapsible = false; exports.collapsible = false;

2
static/js/popovers.js
View File

@ -74,11 +74,9 @@ exports.toggle_actions_popover = function (element, id) {
can_edit_message: can_edit, can_edit_message: can_edit,
can_mute_topic: can_mute_topic, can_mute_topic: can_mute_topic,
can_unmute_topic: can_unmute_topic, can_unmute_topic: can_unmute_topic,
single_message_narrowing: feature_flags.single_message_narrowing,
pm_with_uri: narrow.pm_with_uri(message.sender_email), pm_with_uri: narrow.pm_with_uri(message.sender_email),
stream_subject_uri: narrow.by_stream_subject_uri(message.stream, message.subject), stream_subject_uri: narrow.by_stream_subject_uri(message.stream, message.subject),
near_time_uri: narrow.by_near_uri(message.id), near_time_uri: narrow.by_near_uri(message.id),
single_message_uri: narrow.by_message_uri(message.id),
conversation_time_uri: narrow.by_conversation_and_time_uri(message), conversation_time_uri: narrow.by_conversation_and_time_uri(message),
narrowed: narrow.active() narrowed: narrow.active()
}; };

17
static/templates/actions_popover_content.handlebars
View File

@ -50,18 +50,11 @@
</li> </li>
{{/if}} {{/if}}
{{#if single_message_narrowing}} <li>
<li> <a href="{{ conversation_time_uri }}" class="popover_narrow_by_conversation_and_time" data-msgid="{{message.id}}">
<a href="{{ conversation_time_uri }}" class="popover_narrow_by_conversation_and_time" data-msgid="{{message.id}}"> <i class="icon-vector-link"></i> Narrow to this conversation and time
<i class="icon-vector-link"></i> Narrow to this conversation and time </a>
</a> </li>
</li>
<li>
<a href="{{ single_message_uri }}" class="popover_narrow_by_id" data-msgid="{{message.id}}">
<i class="icon-vector-link"></i> Narrow to just this message
</a>
</li>
{{/if}}
<li> <li>
<a href="#" class="popover_toggle_collapse" data-msgid="{{message.id}}"> <a href="#" class="popover_toggle_collapse" data-msgid="{{message.id}}">