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

converted load-more-link to button, added loading-gif, fixed typo

Browse source
This commit is contained in:
mluto 2013-01-07 19:15:55 +01:00
parent 825b258d99
commit bc05f9eb0a
6 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -413,9 +413,16 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
chat.scrollDown();
chat.gotInitalMessages = true;
chat.historyPointer = clientVars.chatHead - msg.messages.length;
if(chat.historyPointer == -1) // there are less than 100 messages
$("#chatloadmessages").css("display", "none");
}
// messages are loaded, so hide the loading-ball
$("#chatloadmessagesball").css("display", "none");
// there are less than 100 messages or we reached the top
if(chat.historyPointer <= 0)
$("#chatloadmessagesbutton").css("display", "none");
else // there are still more messages, re-show the load-button
$("#chatloadmessagesbutton").css("display", "block");
}
else if (msg.type == "SERVER_MESSAGE")
{

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

@ -564,7 +564,7 @@ var pad = {
}
else // there are no messages
{
$("#chatloadmessages").css("display", "none");
$("#chatloadmessagesbutton").css("display", "none");
}
function postAceInit()