mirror of
https://github.com/overleaf/overleaf.git
synced 2025-02-16 23:41:45 +00:00
Revert to method not sending cursorData because of duplication
This commit is contained in:
parent
cb12e1c6f6
commit
2ec760403f
1 changed files with 20 additions and 19 deletions
|
@ -129,7 +129,6 @@ module.exports = WebsocketController =
|
|||
# after the initial joinDoc since we know they are already authorised.
|
||||
## AuthorizationManager.removeAccessToDoc client, doc_id
|
||||
callback()
|
||||
|
||||
updateClientPosition: (client, cursorData, callback = (error) ->) ->
|
||||
metrics.inc "editor.update-client-position", 0.1
|
||||
Utils.getClientAttributes client, [
|
||||
|
@ -145,24 +144,26 @@ module.exports = WebsocketController =
|
|||
cursorData.id = client.id
|
||||
cursorData.user_id = user_id if user_id?
|
||||
cursorData.email = email if email?
|
||||
cursorData.name = if first_name && last_name
|
||||
"#{first_name} #{last_name}"
|
||||
else if first_name
|
||||
first_name
|
||||
else if last_name
|
||||
last_name
|
||||
if first_name or last_name
|
||||
cursorData.name = if first_name && last_name
|
||||
"#{first_name} #{last_name}"
|
||||
else if first_name
|
||||
first_name
|
||||
else if last_name
|
||||
last_name
|
||||
ConnectedUsersManager.updateUserPosition(project_id, client.id, {
|
||||
first_name: first_name,
|
||||
last_name: last_name,
|
||||
email: email,
|
||||
_id: user_id
|
||||
}, {
|
||||
row: cursorData.row,
|
||||
column: cursorData.column,
|
||||
doc_id: cursorData.doc_id
|
||||
}, callback)
|
||||
else
|
||||
""
|
||||
ConnectedUsersManager.updateUserPosition(project_id, client.id, {
|
||||
first_name: first_name,
|
||||
last_name: last_name,
|
||||
email: email,
|
||||
_id: user_id
|
||||
}, {
|
||||
row: cursorData.row,
|
||||
column: cursorData.column,
|
||||
doc_id: cursorData.doc_id
|
||||
}, callback)
|
||||
cursorData.name = ""
|
||||
callback()
|
||||
WebsocketLoadBalancer.emitToRoom(project_id, "clientTracking.clientUpdated", cursorData)
|
||||
|
||||
getConnectedUsers: (client, callback = (error, users) ->) ->
|
||||
|
@ -221,4 +222,4 @@ module.exports = WebsocketController =
|
|||
for op in update.op
|
||||
if !op.c?
|
||||
return false
|
||||
return true
|
||||
return true
|
Loading…
Reference in a new issue