From b33929fa8321129c00692f2a8fdecc31ad7b1d4c Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Thu, 21 Sep 2017 13:36:31 +0100 Subject: [PATCH] DRY up --- .../public/coffee/ide/editor/Document.coffee | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/services/web/public/coffee/ide/editor/Document.coffee b/services/web/public/coffee/ide/editor/Document.coffee index c22c6cd6b3..43e11a29db 100644 --- a/services/web/public/coffee/ide/editor/Document.coffee +++ b/services/web/public/coffee/ide/editor/Document.coffee @@ -256,17 +256,7 @@ define [ return callback(error) if error? @joined = true @doc.catchUp( updates ) - - 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 } = @_decodeRanges(ranges) @_catchUpRanges( changes, comments ) callback() else @@ -274,21 +264,23 @@ define [ return callback(error) if error? @joined = true @doc = new ShareJsDoc @doc_id, docLines, version, @ide.socket - - 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 } = @_decodeRanges(ranges) @ranges = new RangesTracker(changes, 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 } + _leaveDoc: (callback = (error) ->) -> sl_console.log '[_leaveDoc] Sending leaveDoc request' @ide.socket.emit 'leaveDoc', @doc_id, (error) =>