Browse Source

Fix history requesting for MUC when joining

pull/469/head
Timothée Jaussoin 8 years ago
parent
commit
54926f1c3e
  1. 1
      app/widgets/Chat/Chat.php
  2. 3
      app/widgets/Chat/chat.js
  3. 3
      app/widgets/Chat/chat.tpl

1
app/widgets/Chat/Chat.php

@ -800,5 +800,6 @@ class Chat extends \Movim\Widget\Base
function display()
{
$this->view->assign('pagination', $this->_pagination);
}
}

3
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);
}

3
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>
Loading…
Cancel
Save