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

minor: Rename loading_more_messages_indicator. 

`loading_more_messages_indicator` is renamed to
`loading_older_messages_indicator`.

This is a prep commit to introduce
`loading_newer_messages_indicator`.
This commit is contained in:
Ryan Rehman 2020-05-24 18:57:58 +05:30 committed by Tim Abbott
parent 0b93e09e72
commit 9c733b42df
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
static/js/message_scroll.js
View File

@ -1,19 +1,19 @@
let actively_scrolling = false;
let loading_more_messages_indicator_showing = false;
let loading_older_messages_indicator_showing = false;
exports.show_loading_older = function () {
if (!loading_more_messages_indicator_showing) {
loading.make_indicator($('#loading_more_messages_indicator'),
if (!loading_older_messages_indicator_showing) {
loading.make_indicator($('#loading_older_messages_indicator'),
{abs_positioned: true});
loading_more_messages_indicator_showing = true;
loading_older_messages_indicator_showing = true;
floating_recipient_bar.hide();
}
};
exports.hide_loading_older = function () {
if (loading_more_messages_indicator_showing) {
loading.destroy_indicator($("#loading_more_messages_indicator"));
loading_more_messages_indicator_showing = false;
if (loading_older_messages_indicator_showing) {
loading.destroy_indicator($("#loading_older_messages_indicator"));
loading_older_messages_indicator_showing = false;
}
};

2
static/styles/night_mode.scss
View File

@ -692,7 +692,7 @@ on a dark background, and don't change the dark labels dark either. */
color: hsl(200, 79%, 66%);
}
#loading_more_messages_indicator path {
#loading_older_messages_indicator path {
fill: hsl(0, 0%, 100%);
}

6
static/styles/zulip.scss
View File

@ -2011,16 +2011,16 @@ div.floating_recipient {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
}
#loading_more_messages_indicator {
#loading_older_messages_indicator {
margin: 10px;
}
#loading_more_messages_indicator_box_container {
#loading_older_messages_indicator_box_container {
position: absolute;
left: 50%;
}
#loading_more_messages_indicator_box {
#loading_older_messages_indicator_box {
position: relative;
left: -50%;
top: -43px;

2
templates/zerver/app/home.html
View File

@ -29,7 +29,7 @@
{% endtrans %}
</p>
</div>
<div id="loading_more_messages_indicator"></div>
<div id="loading_older_messages_indicator"></div>
<div id="page_loading_indicator"></div>
<div id="first_run_message" class="empty_feed_notice">
<h4>{% trans %}Welcome to Zulip.{% endtrans %}</h4>