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

Refactor the 'floating stream/subject' bar. 

(imported from commit 76528653c29809bc461693b069140bfdfbeec97b)
This commit is contained in:
Waseem Daher 2012-10-15 12:21:05 -04:00
parent 470143e254
commit 6015d1d928
1 changed files with 40 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@
// scrollbar when we switch to a new tab (and restore it // scrollbar when we switch to a new tab (and restore it
// when we switch back.) // when we switch back.)
var scroll_positions = {}; var scroll_positions = {};
var current_label;
var current_scroll_direction = "down"; var current_scroll_direction = "down";
function update_scroll_direction(delta) { function update_scroll_direction(delta) {
@ -138,72 +137,69 @@ function update_autocomplete() {
autocomplete_needs_update = false; autocomplete_needs_update = false;
} }
function replace_narrowbar() { function replace_narrowbar(desired_label) {
if ($(current_label).children(".message_newstyle_stream").length !== 0) { if (desired_label.children(".message_newstyle_stream").length !== 0) {
$("#current_label_stream td:first").replaceWith($(current_label).children(".message_newstyle_stream").clone()); $("#current_label_stream td:first").replaceWith(desired_label.children(".message_newstyle_stream").clone());
$("#current_label_stream td:last").replaceWith($(current_label).children(".message_newstyle_subject").clone()); $("#current_label_stream td:last").replaceWith(desired_label.children(".message_newstyle_subject").clone());
$("#current_label_huddle").css('display', 'none'); $("#current_label_huddle").css('display', 'none');
$("#current_label_stream").css('display', 'table-row'); $("#current_label_stream").css('display', 'table-row');
} else { } else {
$("#current_label_huddle td:first").replaceWith($(current_label).children(".message_newstyle_pm").clone()); $("#current_label_huddle td:first").replaceWith(desired_label.children(".message_newstyle_pm").clone());
$("#current_label_stream").css('display', 'none'); $("#current_label_stream").css('display', 'none');
$("#current_label_huddle").css('display', 'table-row'); $("#current_label_huddle").css('display', 'table-row');
} }
$(".floating_indicator").css('visibility', 'visible');
} }
function hide_narrowbar() { function hide_narrowbar() {
$("#current_label_stream").css('display', 'none'); $(".floating_indicator").css('visibility', 'hidden');
$("#current_label_huddle").css('display', 'none');
} }
function update_fixed_narrowbar() { function update_fixed_narrowbar() {
var fixed_narrowbar = $("#current_label_stream"); var fixed_narrowbar = $("#narrowbox");
var fixed_narrowbar_top = fixed_narrowbar.offset().top; var fixed_narrowbar_top = fixed_narrowbar.offset().top;
var fixed_narrowbar_bottom = fixed_narrowbar_top + fixed_narrowbar.height(); var fixed_narrowbar_bottom = fixed_narrowbar_top + fixed_narrowbar.height();
// The recipient row directly above the fixed_narrowbar. // Find the last message where the top of the recipient
// row is no longer visible
var new_label_candidate = $(".focused_table .recipient_row").filter(function () { var new_label_candidate = $(".focused_table .recipient_row").filter(function () {
return ($(this).offset().top < fixed_narrowbar_top); return ($(this).offset().top < fixed_narrowbar_bottom);
}).last(); }).last();
if (new_label_candidate.length === 0) {
var bookend_cover = new_label_candidate.nextUntil(".bookend_tr").next(".bookend_tr"); // We're at the top of the page and no labels are above us.
if (bookend_cover.length === 0) { hide_narrowbar();
// We have no bookends.
return; return;
} }
bookend_cover = $(bookend_cover[0]); var current_label = $(new_label_candidate[0]);
var my_top = $(bookend_cover).offset().top;
var my_bottom = my_top + bookend_cover.height();
if (current_scroll_direction === "down") { // We now know what the floating stream/subject bar should say.
if ((my_top >= fixed_narrowbar_top) && // Do we show it?
(my_top < fixed_narrowbar_bottom)) {
// The bookend has entered the space occupied by the // Hide if the bottom of our floating stream/subject label is not
// fixed_narrowbar, so hide the fixed_narrowbar. // lower than the bottom of current_label (since that means we're
// covering up a label that already exists).
if (fixed_narrowbar_bottom <=
(current_label.offset().top + current_label.height())) {
hide_narrowbar(); hide_narrowbar();
} else if ((new_label_candidate.length !== 0) && return;
(new_label_candidate[0] !== current_label)) {
current_label = new_label_candidate[0];
replace_narrowbar();
} }
} else {
if ((my_bottom >= fixed_narrowbar_top) && // Hide if our bottom is in our bookend (or one bookend-height
(my_bottom < fixed_narrowbar_bottom)) { // above it). This means we're not showing any useful part of the
// We are scrolling up and have just reached a bookend, so hide the // message above us, so why bother showing the label?)
// old fixed_narrowbar for the stream below us. var current_label_bookend = new_label_candidate.nextUntil(".bookend_tr").next(".bookend_tr");
// (The last message currently doesn't have a bookend, which is why this might be 0).
if (current_label_bookend.length > 0) {
var my_bookend = $(current_label_bookend[0]);
if (fixed_narrowbar_bottom >
(my_bookend.offset().top - my_bookend.height())) {
hide_narrowbar(); hide_narrowbar();
} else { return;
if ((my_bottom >= fixed_narrowbar_bottom) &&
(my_bottom < fixed_narrowbar_top + fixed_narrowbar.height() * 2) &&
(new_label_candidate.length !== 0) &&
(new_label_candidate[0] !== current_label)) {
// We are scrolling up and enough of the above stream is in view
// that we should reveal the fixed_narrowbar for that stream.
current_label = new_label_candidate[0];
replace_narrowbar();
}
} }
} }
// If we've gotten this far, well, show it.
replace_narrowbar(current_label);
} }
$(function () { $(function () {