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

Fix selecting huddles using the mouse type-tabs.

Browse Source 
(imported from commit 6b9981cf6d5a5aaf9d644a18cc04397f3cf0dead)
This commit is contained in:
Tim Abbott
2012-10-20 10:14:47 -04:00
parent a8ee0ecc69
commit bf007776ce
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,13 +77,28 @@ exports.clear = function () {
$("#compose").find('input[type=text], textarea').val(''); $("#compose").find('input[type=text], textarea').val('');
}; };
exports.set_message_type = function (tabname) {
is_composing_message = tabname;
$("#send-status").removeClass(status_classes).hide();
if (tabname === "stream") {
$('#personal-message').hide();
$('#stream-message').show();
$('#new_message_type').val('stream');
$("#stream").focus();
} else {
$('#personal-message').show();
$('#stream-message').hide();
$('#new_message_type').val('personal');
$("#huddle_recipient").focus();
}
};
exports.toggle_mode = function () { exports.toggle_mode = function () {
if ($("#message-type-tabs li.active").find("a[href=#stream-message]").length !== 0) { if ($("#message-type-tabs li.active").find("a[href=#stream-message]").length !== 0) {
// In stream tab, switch to personals. // In stream tab, switch to personals.
is_composing_message = "huddle";
exports.show('personal', $("#huddle_recipient")); exports.show('personal', $("#huddle_recipient"));
} else { } else {
is_composing_message = "stream";
exports.show('stream', $("#stream")); exports.show('stream', $("#stream"));
} }
}; };

12
zephyr/static/js/ui.js
View File

@@ -262,18 +262,10 @@ $(function () {
// created after ready() is called. // created after ready() is called.
$('#message-type-tabs a[href="#stream-message"]').on('shown', function (e) { $('#message-type-tabs a[href="#stream-message"]').on('shown', function (e) {
$('#personal-message').hide(); compose.set_message_type('stream');
$('#stream-message').show();
$('#new_message_type').val('stream');
$("#send-status").removeClass(status_classes).hide();
focus_on("stream");
}); });
$('#message-type-tabs a[href="#personal-message"]').on('shown', function (e) { $('#message-type-tabs a[href="#personal-message"]').on('shown', function (e) {
$('#personal-message').show(); compose.set_message_type('huddle');
$('#stream-message').hide();
$('#new_message_type').val('personal');
$("#send-status").removeClass(status_classes).hide();
focus_on("huddle_recipient");
}); });
// Prepare the click handler for subbing to a new stream to which // Prepare the click handler for subbing to a new stream to which