public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

collab_client: Always run deferred actions on connect

rhansen-collab_client
Richard Hansen 2021-03-30 17:00:14 -04:00
parent 54a746ce94
commit 02ae7f5c36
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/static/js/broadcast.js
View File

@ -443,7 +443,6 @@ const loadBroadcastJS = (socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
};
// to start upon window load, just push a function onto this array
// window['onloadFuncts'].push(setUpSocket);
// window['onloadFuncts'].push(function ()
fireWhenAllScriptsAreLoaded.push(() => {
// set up the currentDivs and DOM

10
src/static/js/collab_client.js
View File

@ -148,11 +148,6 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, options, _pad)
handleUserChanges();
};
const setUpSocket = () => {
setChannelState('CONNECTED');
doDeferredActions();
};
const sendMessage = (msg) => {
getSocket().json.send(
{
@ -362,6 +357,9 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, options, _pad)
case 'CONNECTING':
startConnectTime = Date.now();
break;
case 'CONNECTED':
doDeferredActions();
break;
}
};
@ -502,7 +500,7 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, options, _pad)
editor.setBaseAttributedText(serverVars.initialAttributedText, serverVars.apool);
editor.setUserChangeNotificationCallback(handleUserChanges);
setUpSocket();
setChannelState('CONNECTED');
return self;
};