fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[collab_client] remove socketid because its not used

This commit is contained in:
webzwo0i 2013-12-08 17:20:53 +01:00
parent f25fed1c25
commit 8175af3017
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
} }
var socketId;
//var socket; //var socket;
var channelState = "DISCONNECTED"; var channelState = "DISCONNECTED";

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

@ -44,7 +44,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
var state = "IDLE"; var state = "IDLE";
var stateMessage; var stateMessage;
var stateMessageSocketId;
var channelState = "CONNECTING"; var channelState = "CONNECTING";
var appLevelDisconnectReason = null; var appLevelDisconnectReason = null;
@ -52,7 +51,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
var initialStartConnectTime = 0; var initialStartConnectTime = 0;
var userId = initialUserInfo.userId; var userId = initialUserInfo.userId;
var socketId;
//var socket; //var socket;
var userSet = {}; // userId -> userInfo var userSet = {}; // userId -> userInfo
userSet[userId] = initialUserInfo; userSet[userId] = initialUserInfo;
@ -196,7 +194,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
changeset: userChangesData.changeset, changeset: userChangesData.changeset,
apool: userChangesData.apool apool: userChangesData.apool
}; };
stateMessageSocketId = socketId;
sendMessage(stateMessage); sendMessage(stateMessage);
sentMessage = true; sentMessage = true;
callbacks.onInternalAction("commitPerformed"); callbacks.onInternalAction("commitPerformed");
@ -593,7 +590,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
{ {
obj.committedChangeset = stateMessage.changeset; obj.committedChangeset = stateMessage.changeset;
obj.committedChangesetAPool = stateMessage.apool; obj.committedChangesetAPool = stateMessage.apool;
obj.committedChangesetSocketId = stateMessageSocketId;
editor.applyPreparedChangesetToBase(); editor.applyPreparedChangesetToBase();
} }
var userChangesData = editor.prepareUserChangeset(); var userChangesData = editor.prepareUserChangeset();