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

Some improvements on message handling, on client and serverside

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-03-27 12:49:04 +01:00
parent c563faf431
commit f28a5c18c6
3 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
static/js/collab_client.js
View file

@ -195,11 +195,11 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options) {
initialStartConnectTime = +new Date();
// });
socket.on('message', function(obj){
/*socket.on('message', function(obj){
if(window.console)
console.log(obj);
handleMessageFromServer(obj);
});
});*/
socket.on('disconnect', function(obj){
handleSocketClosed(true);
@ -297,6 +297,9 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options) {
}
function handleMessageFromServer(evt) {
if(window.console)
console.log(evt);
if (! socket) return;
if (! evt.data) return;
var wrapper = evt;
@ -636,6 +639,7 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options) {
setOnConnectionTrouble: function(cb) { callbacks.onConnectionTrouble = cb; },
setOnServerMessage: function(cb) { callbacks.onServerMessage = cb; },
updateUserInfo: defer(updateUserInfo),
handleMessageFromServer: handleMessageFromServer,
getConnectedUsers: getConnectedUsers,
sendClientMessage: sendClientMessage,
getCurrentRevisionNumber: getCurrentRevisionNumber,

37
static/js/pad2.js
View file

@ -85,23 +85,42 @@ function handshake()
var initalized = false;
socket.on('message', function(obj){
//if we haven't recieved the clientVars yet, then this message should it be
if(!receivedClientVars)
{
receivedClientVars=true;
//We get a disconnect message
if(obj.disconnect)
{
socket.disconnect();
alert("You have this Pad already opened in another Window/Tab");
return;
}
//yeah, the clientVars are here :). So we can start initalizing the Pad
else
{
receivedClientVars=true;
clientVars = obj;
clientVars.userAgent=navigator.userAgent;
clientVars.collab_client_vars.clientAgent=navigator.userAgent;
pad.init();
initalized=true;
clientVars = obj;
clientVars.userAgent=navigator.userAgent;
clientVars.collab_client_vars.clientAgent=navigator.userAgent;
pad.init();
initalized=true;
}
}
//This handles every Message after the clientVars
else
{
//We can't handle the message before we initalized the pad, so let this message bounce back in 100ms
if(!initalized)
{
setTimeOut(this(obj));
setTimeOut(this(obj), 100);
}
//We're initalized, so give this message to the collabClient
else
{
pad.collabClient.handleMessageFromServer(obj);
}
}
});