github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-08 14:51:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up decoding from websockets

Browse source
This commit is contained in:
Alasdair Smith 2017-09-21 15:37:27 +01:00
parent a022f83cce
commit 42b604dcda
1 changed files with 10 additions and 14 deletions

24
services/web/public/coffee/ide/editor/Document.coffee
View file

@ -256,30 +256,26 @@ define [
return callback(error) if error?
@joined = true
@doc.catchUp( updates )
{ changes, comments } = @_decodeRanges(ranges)
@_catchUpRanges( changes, comments )
@_decodeRanges(ranges)
@_catchUpRanges(ranges?.changes, ranges?.comments)
callback()
else
@ide.socket.emit 'joinDoc', @doc_id, { encodeRanges: true }, (error, docLines, version, updates, ranges) =>
return callback(error) if error?
@joined = true
@doc = new ShareJsDoc @doc_id, docLines, version, @ide.socket
{ changes, comments } = @_decodeRanges(ranges)
@ranges = new RangesTracker(changes, comments)
@_decodeRanges(ranges)
@ranges = new RangesTracker(ranges?.changes, ranges?.comments)
@_bindToShareJsDocEvents()
callback()
_decodeRanges: (ranges) ->
if ranges?.changes
changes = for change in ranges.changes
change.op.i = decodeURIComponent(escape(change.op.i)) if change.op.i
change.op.d = decodeURIComponent(escape(change.op.d)) if change.op.d
change
if ranges?.comments
comments = for comment in ranges.comments
comment.op.c = decodeURIComponent(escape(comment.op.c))
comment
{ changes, comments }
decodeFromWebsockets = (text) -> decodeURIComponent(escape(text))
for change in ranges.changes or []
change.op.i = decodeFromWebsockets(change.op.i) if change.op.i
change.op.d = decodeFromWebsockets(change.op.d) if change.op.d
for comment in ranges.comments or []
comment.op.c = decodeFromWebsockets(comment.op.c)
_leaveDoc: (callback = (error) ->) ->
sl_console.log '[_leaveDoc] Sending leaveDoc request'