github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

First pass at decoding changes & comments in ranges

Browse source
This commit is contained in:
Alasdair Smith 2017-09-21 13:25:19 +01:00
parent e2547e0051
commit 24f44889a7
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -256,14 +256,36 @@ define [
return callback(error) if error?
@joined = true
@doc.catchUp( updates )
@_catchUpRanges( ranges?.changes, ranges?.comments )
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
@_catchUpRanges( changes, comments )
callback()
else
@ide.socket.emit 'joinDoc', @doc_id, (error, docLines, version, updates, ranges) =>
return callback(error) if error?
@joined = true
@doc = new ShareJsDoc @doc_id, docLines, version, @ide.socket
@ranges = new RangesTracker(ranges?.changes, ranges?.comments)
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
@ranges = new RangesTracker(changes, comments)
@_bindToShareJsDocEvents()
callback()