From 54926f1c3e11a25210113fe1b446f0c672b101f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?= <edhelas@movim.eu>
Date: Tue, 29 Aug 2017 17:58:49 +0200
Subject: [PATCH] Fix history requesting for MUC when joining

---
 app/widgets/Chat/Chat.php | 1 +
 app/widgets/Chat/chat.js  | 3 ++-
 app/widgets/Chat/chat.tpl | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/widgets/Chat/Chat.php b/app/widgets/Chat/Chat.php
index ec974cbcb..ad983eb91 100644
--- a/app/widgets/Chat/Chat.php
+++ b/app/widgets/Chat/Chat.php
@@ -800,5 +800,6 @@ class Chat extends \Movim\Widget\Base
 
     function display()
     {
+        $this->view->assign('pagination', $this->_pagination);
     }
 }
diff --git a/app/widgets/Chat/chat.js b/app/widgets/Chat/chat.js
index 5ed678d1a..a334a59e2 100644
--- a/app/widgets/Chat/chat.js
+++ b/app/widgets/Chat/chat.js
@@ -245,7 +245,8 @@ var Chat = {
     setScrollBehaviour : function() {
         var discussion = document.querySelector('#chat_widget div.contained');
         discussion.onscroll = function() {
-            if(this.scrollTop < 1) {
+            if(this.scrollTop < 1
+            && discussion.querySelectorAll('ul li p').length >= Chat.pagination) {
                 Chat_ajaxGetHistory(Chat.getTextarea().dataset.jid, Chat.currentDate);
             }
 
diff --git a/app/widgets/Chat/chat.tpl b/app/widgets/Chat/chat.tpl
index 34951f28c..95a2b22b9 100644
--- a/app/widgets/Chat/chat.tpl
+++ b/app/widgets/Chat/chat.tpl
@@ -1,4 +1,7 @@
 <div id="chat_widget" style="background-color: #EEE;">
+    <script type="text/javascript">
+        Chat.pagination = {$pagination};
+    </script>
     {$c->prepareEmpty()}
 </div>