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

Replace compose.toggle_mode with compose.set_mode

Browse Source 
This fixes a bug where you could click on the already-selected mode button, and
it would switch modes without changing which button is selected.

(imported from commit 263ee0b52ba844c52a3a60968bb1bbff73482412)
This commit is contained in:
Keegan McAllister
2012-11-29 14:35:24 -05:00
parent d55ccd32af
commit 1047bf49b4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zephyr/home.html
View File

@@ -101,12 +101,12 @@
<div id="stream_or_huddle"> <div id="stream_or_huddle">
<ul class="nav nav-pills nav-stacked" id="message-type-tabs"> <ul class="nav nav-pills nav-stacked" id="message-type-tabs">
<li class="active" id="stream_toggle"> <li class="active" id="stream_toggle">
<a href="#stream-message" data-toggle="pill" title="Send a stream message" tabindex="100" onclick="compose.toggle_mode();"> <a href="#stream-message" data-toggle="pill" title="Send a stream message" tabindex="100" onclick="compose.set_mode('stream');">
<i class="icon-bullhorn"></i> <i class="icon-bullhorn"></i>
</a> </a>
</li> </li>
<li id="private_message_toggle"> <li id="private_message_toggle">
<a href="#private-message" data-toggle="pill" title="Send a private message" tabindex="110" onclick="compose.toggle_mode();"> <a href="#private-message" data-toggle="pill" title="Send a private message" tabindex="110" onclick="compose.set_mode('private');">
<i class="icon-user"></i> <i class="icon-user"></i>
</a> </a>
</li> </li>

7
zephyr/static/js/compose.js
View File

@@ -150,9 +150,10 @@ exports.clear = function () {
$("#compose").find('input[type=text], textarea').val(''); $("#compose").find('input[type=text], textarea').val('');
}; };
exports.toggle_mode = function () { // Set the mode of a compose already in progress.
if (compose.composing() === 'stream') { // Does not clear the input fields.
// In stream tab, switch to private exports.set_mode = function (mode) {
if (mode === 'private') {
show('private', $("#private_message_recipient")); show('private', $("#private_message_recipient"));
is_composing_message = "private"; is_composing_message = "private";
} else { } else {