mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-26 02:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Added link to load more chat-messages using new GET_CHAT_MESSAGES

Browse source
This commit is contained in:
mluto 2013-01-07 17:36:03 +01:00
parent 5592c4b0fe
commit 5f81daed0a
7 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/static/css/pad.css
View file

@ -488,6 +488,11 @@ table#otheruserstable {
-ms-overflow-x: hidden;
overflow-x: hidden;
}
#chatloadmessages
{
color: blue;
text-decoration: underline;
}
#chatinputbox {
padding: 3px 2px;
position: absolute;

16
src/static/js/chat.js
View file

@ -29,6 +29,7 @@ var chat = (function()
{
var isStuck = false;
var gotInitialMessages = false;
var historyPointer = 0;
var chatMentions = 0;
var self = {
show: function ()
@ -114,7 +115,7 @@ var chat = (function()
var html = "<p class='" + authorClass + "'><b>" + authorName + ":</b><span class='time " + authorClass + "'>" + timeStr + "</span> " + text + "</p>";
if(isHistoryAdd)
$("#chattext").prepend(html);
$(html).insertAfter('#chatloadmessages');
else
$("#chattext").append(html);
@ -164,6 +165,19 @@ var chat = (function()
// initial messages are loaded in pad.js' _afterHandshake
$("#chatcounter").text(0);
$("#chatloadmessages").click(function()
{
var start = Math.max(self.historyPointer - 100, 0);
var end = self.historyPointer;
if(start == end) // nothing to load
return;
if(start == 0) // reached the top
$("#chatloadmessages").css("display", "none");
pad.collabClient.sendMessage({"type": "GET_CHAT_MESSAGES", "start": start, "end": end});
self.historyPointer = start;
});
}
}

5
src/static/js/collab_client.js
View file

@ -411,7 +411,10 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
if(!chat.gotInitalMessages)
{
chat.scrollDown();
chat.gotInitalMessages = true;
chat.gotInitalMessages = true;
chat.historyPointer = clientVars.chatHead - msg.messages.length;
if(chat.historyPointer == -1) // there are less than 100 messages
$("#chatloadmessages").css("display", "none");
}
}
else if (msg.type == "SERVER_MESSAGE")

13
src/static/js/pad.js
View file

@ -556,9 +556,16 @@ var pad = {
pad.collabClient.setOnInternalAction(pad.handleCollabAction);
// load initial chat-messages
var chatHead = clientVars.chatHead;
var start = Math.max(chatHead - 100, 0);
pad.collabClient.sendMessage({"type": "GET_CHAT_MESSAGES", "start": start, "end": chatHead});
if(clientVars.chatHead != -1)
{
var chatHead = clientVars.chatHead;
var start = Math.max(chatHead - 100, 0);
pad.collabClient.sendMessage({"type": "GET_CHAT_MESSAGES", "start": start, "end": chatHead});
}
else // there are no messages
{
$("#chatloadmessages").css("display", "none");
}
function postAceInit()
{