diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 2260320fa..55fa7f263 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -108,7 +108,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { this.startPosition = e.srcElement.scrollTop; let scroll = e.srcElement.scrollTop; let windowHeight = e.srcElement.scrollHeight; - let containerHeight = windowHeight - 596.59997558594; + let containerHeight = windowHeight - e.srcElement.clientHeight; if (scroll > this.currentPosition) { //alert('BOTTOM'); diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 43b522488..090b34d78 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -138,7 +138,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { this.startPosition = e.srcElement.scrollTop; let scroll = e.srcElement.scrollTop; let windowHeight = e.srcElement.scrollHeight; - let containerHeight = windowHeight - 596.59997558594; + let containerHeight = windowHeight - e.srcElement.clientHeight; console.log(this.startPosition); console.log(windowHeight); diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 878cc8e52..56849526b 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -174,7 +174,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe this.startPosition = e.srcElement.scrollTop; let scroll = e.srcElement.scrollTop; let windowHeight = e.srcElement.scrollHeight; - let containerHeight = windowHeight - 454.199951171875; + let containerHeight = windowHeight - e.srcElement.clientHeight; if (scroll > this.currentPosition) { //alert('BOTTOM'); diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index e5cdb8bd0..1165e1524 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -140,7 +140,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy this.startPosition = e.srcElement.scrollTop; let scroll = e.srcElement.scrollTop; let windowHeight = e.srcElement.scrollHeight; - let containerHeight = windowHeight - 454.199951171875; + let containerHeight = windowHeight - e.srcElement.clientHeight; + console.log(containerHeight); + console.log(e.srcElement.clientHeight); + + if (scroll > this.currentPosition) { //alert('BOTTOM');