From 9f663c32510cac704b0b6609e66839af2fa9cdaa Mon Sep 17 00:00:00 2001 From: mightymop Date: Mon, 27 Sep 2021 11:17:42 +0200 Subject: fix(mam): show "Load Button" if messare area is empty and show button, if chat history was cleared fix scroll --- src/plugins/mam/Plugin.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/plugins/mam/Plugin.ts b/src/plugins/mam/Plugin.ts index 2f4dbfc3..ca54aa62 100644 --- a/src/plugins/mam/Plugin.ts +++ b/src/plugins/mam/Plugin.ts @@ -150,7 +150,11 @@ export default class MessageArchiveManagementPlugin extends AbstractPlugin { element.append(spanElement); messageAreaElement.on('scroll', function () { - if (messageAreaElement.height() + this.scrollTop < 42 && !archive.isExhausted()) { + let scrollTop : number = messageAreaElement[0].scrollTop; + if (scrollTop<0) + scrollTop=scrollTop*(-1); + + if (((messageAreaElement[0].clientHeight + 42 > messageAreaElement[0].scrollHeight - scrollTop) && !archive.isExhausted())||messageAreaElement.text().trim().length===0) { element.addClass(classNameShow); } else { element.removeClass(classNameShow); @@ -159,6 +163,12 @@ export default class MessageArchiveManagementPlugin extends AbstractPlugin { messageAreaElement.trigger('scroll'); + messageAreaElement.on("DOMSubtreeModified",function(e){ + if ($(this).text().trim().length===0){ + $(this).parent().find('.jsxc-mam-load-more').addClass('jsxc-show'); + } + }); + if (!archive.isExhausted()) { chatWindowElement.addClass(classNameMamEnable); } -- cgit v1.2.3