mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 06:35:15 +00:00
Merge https://github.com/redmatrix/hubzilla into pending_merge
This commit is contained in:
commit
2a32df75f1
1 changed files with 6 additions and 5 deletions
|
@ -119,7 +119,7 @@ $(window).resize(function () {
|
|||
else {
|
||||
adjustInlineTopBarHeight();
|
||||
}
|
||||
$('#chatTopBar').scrollTop($('#chatTopBar').scrollTop() + $('#chatTopBar').outerHeight(true));
|
||||
$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
|
||||
});
|
||||
|
||||
$('#chat-form').submit(function(ev) {
|
||||
|
@ -175,10 +175,9 @@ function update_chats(chats) {
|
|||
$('#chatLineHolder').append(newNode);
|
||||
$(".autotime").timeago();
|
||||
|
||||
});
|
||||
var elem = document.getElementById('chatTopBar');
|
||||
elem.scrollTop = elem.scrollHeight;
|
||||
|
||||
var elem = document.getElementById('chatTopBar');
|
||||
elem.scrollTop = elem.scrollHeight;
|
||||
});
|
||||
}
|
||||
|
||||
function chatJotGetLink() {
|
||||
|
@ -199,10 +198,12 @@ function addmailtext(data) {
|
|||
|
||||
function adjustFullscreenTopBarHeight() {
|
||||
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23);
|
||||
$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
|
||||
}
|
||||
|
||||
function adjustInlineTopBarHeight() {
|
||||
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23);
|
||||
$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
|
||||
}
|
||||
|
||||
function isMobile() {
|
||||
|
|
Loading…
Reference in a new issue