harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse Source
This commit is contained in:
redmatrix 2016-04-01 03:27:46 -07:00
commit 2a32df75f1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
view/tpl/chat.tpl
View File

@ -119,7 +119,7 @@ $(window).resize(function () {
else { else {
adjustInlineTopBarHeight(); adjustInlineTopBarHeight();
} }
$('#chatTopBar').scrollTop($('#chatTopBar').scrollTop() + $('#chatTopBar').outerHeight(true)); $('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
}); });
$('#chat-form').submit(function(ev) { $('#chat-form').submit(function(ev) {
@ -175,10 +175,9 @@ function update_chats(chats) {
$('#chatLineHolder').append(newNode); $('#chatLineHolder').append(newNode);
$(".autotime").timeago(); $(".autotime").timeago();
}); var elem = document.getElementById('chatTopBar');
var elem = document.getElementById('chatTopBar'); elem.scrollTop = elem.scrollHeight;
elem.scrollTop = elem.scrollHeight; });
} }
function chatJotGetLink() { function chatJotGetLink() {
@ -199,10 +198,12 @@ function addmailtext(data) {
function adjustFullscreenTopBarHeight() { function adjustFullscreenTopBarHeight() {
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23); $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - 23);
$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
} }
function adjustInlineTopBarHeight() { function adjustInlineTopBarHeight() {
$('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23); $('#chatTopBar').height($(window).height() - $('#chatBottomBar').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('nav').outerHeight(true) - 23);
$('#chatTopBar').scrollTop($('#chatTopBar').prop('scrollHeight'));
} }
function isMobile() { function isMobile() {