Merge pull request #1060 from jsxc/mam_gui_improvements

feat: show "Load Button" if message area is empty

5 files changed, 10 insertions, 6 deletions

diff --git a/src/connection/services/Vcard.ts b/src/connection/services/Vcard.ts
index 041f6a44..c113cea5 100644
--- a/src/connection/services/Vcard.ts
+++ b/src/connection/services/Vcard.ts
@@ -81,7 +81,7 @@ export default class Vcard extends AbstractService {
    private parseVcardChildren = (stanza: JQuery<XMLDocument>): vCardData => {
       let self = this;
       let data: vCardData = {};
-      let children = stanza.children();
+      let children: JQuery<XMLDocument> = stanza.children() as any;
 
       children.each(function () {
          let item = $(this);
diff --git a/src/plugins/VersionPlugin.ts b/src/plugins/VersionPlugin.ts
index 9ecbb534..25a80914 100644
--- a/src/plugins/VersionPlugin.ts
+++ b/src/plugins/VersionPlugin.ts
@@ -106,7 +106,7 @@ export default class VersionPlugin extends AbstractPlugin {
                OSName = 'Android';
             }
 
-            if (/iPad|iPhone|iPod/.test(userAgent) && !window.MSStream) {
+            if (/iPad|iPhone|iPod/.test(userAgent) && !(<any>window).MSStream) {
                OSName = 'iOS';
             }
          }
diff --git a/src/plugins/mam/Plugin.ts b/src/plugins/mam/Plugin.ts
index 2f4dbfc3..fe6c7737 100644
--- a/src/plugins/mam/Plugin.ts
+++ b/src/plugins/mam/Plugin.ts
@@ -150,14 +150,18 @@ export default class MessageArchiveManagementPlugin extends AbstractPlugin {
       element.append(spanElement);
 
       messageAreaElement.on('scroll', function () {
-         if (messageAreaElement.height() + this.scrollTop < 42 && !archive.isExhausted()) {
+         const topDelta = 10;
+         const scrollTop = Math.abs(this.scrollTop);
+         const isAtTop = this.clientHeight + scrollTop + topDelta >= this.scrollHeight;
+
+         if (isAtTop && !archive.isExhausted()) {
             element.addClass(classNameShow);
          } else {
             element.removeClass(classNameShow);
          }
       });
 
-      messageAreaElement.trigger('scroll');
+      setTimeout(() => messageAreaElement.trigger('scroll'), 1000);
 
       if (!archive.isExhausted()) {
          chatWindowElement.addClass(classNameMamEnable);
diff --git a/src/plugins/omemo/Plugin.ts b/src/plugins/omemo/Plugin.ts
index 4964a76d..c84a9533 100644
--- a/src/plugins/omemo/Plugin.ts
+++ b/src/plugins/omemo/Plugin.ts
@@ -119,7 +119,7 @@ export default class OMEMOPlugin extends EncryptionPlugin {
          let stanza = await pepService.retrieveItems(NS_DEVICELIST, contact.getJid().bare);
 
          this.onDeviceListUpdate(stanza);
-      } catch(err) {
+      } catch (err) {
          this.pluginAPI.Log.debug('Can not retrieve device list', err);
 
          return false;
diff --git a/src/ui/ChatWindow.ts b/src/ui/ChatWindow.ts
index a86763ce..ce03e97e 100644
--- a/src/ui/ChatWindow.ts
+++ b/src/ui/ChatWindow.ts
@@ -162,7 +162,7 @@ export default class ChatWindow {
 
       this.getTranscript().clear();
 
-      this.element.find('.jsxc-message-area').empty();
+      this.element.find('.jsxc-message-area').empty().trigger('scroll');
 
       this.getAccount().triggerChatWindowClearedHook(this, this.contact);
    }