aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-01 03:27:46 -0700
committerredmatrix <git@macgirvin.com>2016-04-01 03:27:46 -0700
commit2a32df75f197ceb3846b7b4e1ec3b127238655ae (patch)
tree027b9d2823c6f471989dcd658dcbc6f231026f99 /view
parente16da7a1668665d5729478a0ffcd960047dbc201 (diff)
parent5b55726a93eb6ee94e4c23a15f18c71b511c752e (diff)
downloadvolse-hubzilla-2a32df75f197ceb3846b7b4e1ec3b127238655ae.tar.gz
volse-hubzilla-2a32df75f197ceb3846b7b4e1ec3b127238655ae.tar.bz2
volse-hubzilla-2a32df75f197ceb3846b7b4e1ec3b127238655ae.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view')
-rw-r--r--view/tpl/chat.tpl11
1 files changed, 6 insertions, 5 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 4750f81fd..633437069 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -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() {