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

Stop using Bootstrap tabs for compose

Browse Source 
(imported from commit 39dfbf9c427aaf3a85507e26ffeb1257da3dc435)
This commit is contained in:
Zev Benjamin
2012-11-26 13:04:22 -05:00
parent 886bda2a45
commit e35ec6e022
3 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/zephyr/home.html
View File

@@ -103,13 +103,13 @@
<td class="message_picture"> <td class="message_picture">
<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"> <li class="active" id="stream_toggle">
<a href="#stream-message" data-toggle="pill" title="Send a stream message" tabindex="100"> <a href="#stream-message" data-toggle="pill" title="Send a stream message" tabindex="100" onclick="compose.toggle_mode();">
<i class="icon-bullhorn"></i> <i class="icon-bullhorn"></i>
</a> </a>
</li> </li>
<li> <li id="private_message_toggle">
<a href="#private-message" data-toggle="pill" title="Send a private message" tabindex="110"> <a href="#private-message" data-toggle="pill" title="Send a private message" tabindex="110" onclick="compose.toggle_mode();">
<i class="icon-user"></i> <i class="icon-user"></i>
</a> </a>
</li> </li>

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

@@ -121,11 +121,23 @@ exports.show = function (tabname, focus_area) {
if (reload.is_in_progress()) { if (reload.is_in_progress()) {
return; return;
} }
if (tabname === "stream") {
$('#private-message').hide();
$('#stream-message').show();
$('#new_message_type').val('stream');
$("#stream_toggle").addClass("active");
$("#private_message_toggle").removeClass("active");
} else {
$('#private-message').show();
$('#stream-message').hide();
$('#new_message_type').val('private');
$("#stream_toggle").removeClass("active");
$("#private_message_toggle").addClass("active");
}
$("#send-status").removeClass(status_classes).hide(); $("#send-status").removeClass(status_classes).hide();
$('#compose').css({visibility: "visible"}); $('#compose').css({visibility: "visible"});
$("#new_message_content").trigger("autosize"); $("#new_message_content").trigger("autosize");
$('.message_comp').slideDown(100); $('.message_comp').slideDown(100);
$('#message-type-tabs a[href="#' + tabname + '-message"]').tab('show');
focus_area.focus(); focus_area.focus();
focus_area.select(); focus_area.select();
}; };
@@ -140,28 +152,14 @@ 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") {
$('#private-message').hide();
$('#stream-message').show();
$('#new_message_type').val('stream');
$("#stream").focus();
} else {
$('#private-message').show();
$('#stream-message').hide();
$('#new_message_type').val('private');
$("#private_message_recipient").focus();
}
};
exports.toggle_mode = function () { exports.toggle_mode = function () {
if ($("#message-type-tabs li.active").find("a[href=#stream-message]").length !== 0) { if (compose.composing() === 'stream') {
// In stream tab, switch to private // In stream tab, switch to private
exports.show('private', $("#private_message_recipient")); exports.show('private', $("#private_message_recipient"));
is_composing_message = "private";
} else { } else {
exports.show('stream', $("#stream")); exports.show('stream', $("#stream"));
is_composing_message = "stream";
} }
}; };

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

@@ -327,13 +327,6 @@ $(function () {
// NB: This just binds to current elements, and won't bind to elements // NB: This just binds to current elements, and won't bind to elements
// created after ready() is called. // created after ready() is called.
$('#message-type-tabs a[href="#stream-message"]').on('shown', function (e) {
compose.set_message_type('stream');
});
$('#message-type-tabs a[href="#private-message"]').on('shown', function (e) {
compose.set_message_type('private');
});
// Prepare the click handler for subbing to a new stream to which // Prepare the click handler for subbing to a new stream to which
// you have composed a message. // you have composed a message.
$('#create-it').click(function () { $('#create-it').click(function () {