summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorwebzwo0i <webzwo0i@c3d2.de>2013-12-08 17:20:53 +0100
committerwebzwo0i <webzwo0i@c3d2.de>2013-12-08 17:20:53 +0100
commit8175af30172b05375effcde679b4cea70ce67839 (patch)
tree819ebfef177658a805263d56a7250d2e5704be20 /src
parentf25fed1c252c781bd64b9ff4b3bfc70cdc863908 (diff)
downloadetherpad-lite-8175af30172b05375effcde679b4cea70ce67839.zip
[collab_client] remove socketid because its not used
Diffstat (limited to 'src')
-rw-r--r--src/static/js/broadcast.js1
-rw-r--r--src/static/js/collab_client.js4
2 files changed, 0 insertions, 5 deletions
diff --git a/src/static/js/broadcast.js b/src/static/js/broadcast.js
index 6bd135bd..d4bda111 100644
--- a/src/static/js/broadcast.js
+++ b/src/static/js/broadcast.js
@@ -77,7 +77,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
}
- var socketId;
//var socket;
var channelState = "DISCONNECTED";
diff --git a/src/static/js/collab_client.js b/src/static/js/collab_client.js
index ec56264f..8dfcfc64 100644
--- a/src/static/js/collab_client.js
+++ b/src/static/js/collab_client.js
@@ -44,7 +44,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
var state = "IDLE";
var stateMessage;
- var stateMessageSocketId;
var channelState = "CONNECTING";
var appLevelDisconnectReason = null;
@@ -52,7 +51,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
var initialStartConnectTime = 0;
var userId = initialUserInfo.userId;
- var socketId;
//var socket;
var userSet = {}; // userId -> userInfo
userSet[userId] = initialUserInfo;
@@ -196,7 +194,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
changeset: userChangesData.changeset,
apool: userChangesData.apool
};
- stateMessageSocketId = socketId;
sendMessage(stateMessage);
sentMessage = true;
callbacks.onInternalAction("commitPerformed");
@@ -593,7 +590,6 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
{
obj.committedChangeset = stateMessage.changeset;
obj.committedChangesetAPool = stateMessage.apool;
- obj.committedChangesetSocketId = stateMessageSocketId;
editor.applyPreparedChangesetToBase();
}
var userChangesData = editor.prepareUserChangeset();