paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-19 05:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename stream sidebar variables/functions to be less generic.

Browse Source 
(imported from commit 1d9fe6cd8da513b7a283c08862ce887159fe498e)
This commit is contained in:
Tim Abbott
2013-05-22 15:35:27 -04:00
committed by Steve Howell
parent 7d20a697d6
commit 4e3ea12dc1
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -711,18 +711,18 @@ function collapse(row) {
show_more_link(row); show_more_link(row);
} }
var current_sidebar_elem; var current_stream_sidebar_elem;
var sidebar_popup_shown_this_click = false; var stream_sidebar_popup_shown_this_click = false;
exports.hide_sidebar_popover = function () { exports.hide_stream_sidebar_popover = function () {
if (ui.sidebar_currently_popped()) { if (ui.stream_sidebar_currently_popped()) {
current_sidebar_elem.popover("destroy"); current_stream_sidebar_elem.popover("destroy");
current_sidebar_elem = undefined; current_stream_sidebar_elem = undefined;
} }
}; };
exports.sidebar_currently_popped = function () { exports.stream_sidebar_currently_popped = function () {
return current_sidebar_elem !== undefined; return current_stream_sidebar_elem !== undefined;
}; };
$(function () { $(function () {
@@ -1239,9 +1239,9 @@ $(function () {
}); });
$('#stream_filters').on('click', 'span.arrow', function (e) { $('#stream_filters').on('click', 'span.arrow', function (e) {
var last_sidebar_elem = current_sidebar_elem; var last_sidebar_elem = current_stream_sidebar_elem;
ui.hide_sidebar_popover(); ui.hide_stream_sidebar_popover();
sidebar_popup_shown_this_click = true; stream_sidebar_popup_shown_this_click = true;
var stream = $(e.target).parents('li').attr('data-name'); var stream = $(e.target).parents('li').attr('data-name');
@@ -1289,11 +1289,11 @@ $(function () {
}); });
$('.streams_popover').on('click', 'a.sp-cancel', function (e) { $('.streams_popover').on('click', 'a.sp-cancel', function (e) {
ui.hide_sidebar_popover(); ui.hide_stream_sidebar_popover();
}); });
}); });
current_sidebar_elem = $(e.target); current_stream_sidebar_elem = $(e.target);
e.preventDefault(); e.preventDefault();
}); });
@@ -1449,21 +1449,21 @@ $(function () {
$('body').on('click', '.toggle_home', function (e) { $('body').on('click', '.toggle_home', function (e) {
var stream = $(e.currentTarget).parents('ul').attr('data-name'); var stream = $(e.currentTarget).parents('ul').attr('data-name');
ui.hide_sidebar_popover(); ui.hide_stream_sidebar_popover();
subs.toggle_home(stream); subs.toggle_home(stream);
e.stopPropagation(); e.stopPropagation();
}); });
$('body').on('click', '.narrow_to_stream', function (e) { $('body').on('click', '.narrow_to_stream', function (e) {
var stream = $(e.currentTarget).parents('ul').attr('data-name'); var stream = $(e.currentTarget).parents('ul').attr('data-name');
ui.hide_sidebar_popover(); ui.hide_stream_sidebar_popover();
narrow.by('stream', stream, {select_first_unread: true, trigger: 'sidebar popover'}); narrow.by('stream', stream, {select_first_unread: true, trigger: 'sidebar popover'});
e.stopPropagation(); e.stopPropagation();
}); });
$('body').on('click', '.compose_to_stream', function (e) { $('body').on('click', '.compose_to_stream', function (e) {
var stream = $(e.currentTarget).parents('ul').attr('data-name'); var stream = $(e.currentTarget).parents('ul').attr('data-name');
ui.hide_sidebar_popover(); ui.hide_stream_sidebar_popover();
compose.start('stream', {"stream": stream, trigger: 'sidebar stream actions'}); compose.start('stream', {"stream": stream, trigger: 'sidebar stream actions'});
e.stopPropagation(); e.stopPropagation();
}); });
@@ -1472,10 +1472,10 @@ $(function () {
// Dismiss the popover if the user has clicked outside it // Dismiss the popover if the user has clicked outside it
if ($('.popover-inner').has(e.target).length === 0) { if ($('.popover-inner').has(e.target).length === 0) {
ui.hide_actions_popover(); ui.hide_actions_popover();
if (sidebar_popup_shown_this_click === false ) { if (stream_sidebar_popup_shown_this_click === false ) {
ui.hide_sidebar_popover(); ui.hide_stream_sidebar_popover();
} }
sidebar_popup_shown_this_click = false; stream_sidebar_popup_shown_this_click = false;
} }
// Unfocus our compose area if we click out of it. Don't let exits out // Unfocus our compose area if we click out of it. Don't let exits out