From 446ca7212a91bd38f68f44d42e7d3e2e00f5c620 Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Wed, 9 Nov 2016 12:19:48 +0000
Subject: [PATCH] Track timestamps of changes

---
 services/web/app/views/project/editor/editor.jade             | 1 +
 .../directives/aceEditor/track-changes/ChangesTracker.coffee  | 4 ++++
 .../aceEditor/track-changes/TrackChangesManager.coffee        | 1 +
 3 files changed, 6 insertions(+)

diff --git a/services/web/app/views/project/editor/editor.jade b/services/web/app/views/project/editor/editor.jade
index 7d68e82026..b48444162e 100644
--- a/services/web/app/views/project/editor/editor.jade
+++ b/services/web/app/views/project/editor/editor.jade
@@ -51,6 +51,7 @@ div.full-size(
 			.review-panel-scroller
 				.review-entry-list(review-panel-sorted)
 					.review-entry(ng-repeat="(entry_id, entry) in reviewPanel.entries", ng-style="{'top': top}")
+						div.small {{ entry.metadata.ts }}
 						{{ entry.content }}
 
 	.ui-layout-east
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/ChangesTracker.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/ChangesTracker.coffee
index 7bc5d328bd..82fb72bda7 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/ChangesTracker.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/ChangesTracker.coffee
@@ -59,8 +59,10 @@ define [
 				offset, length, metadata
 			}
 			@emit "comment:added", comment
+			return comment
 		
 		applyOp: (op, metadata) ->
+			metadata.ts ?= new Date()
 			# Apply an op that has been applied to the document to our changes to keep them up to date
 			if op.i?
 				@applyInsertToChanges(op, metadata)
@@ -149,6 +151,7 @@ define [
 							is_same_user
 						offset = op_start - change_start
 						change.op.i = change.op.i.slice(0, offset) + op.i + change.op.i.slice(offset)
+						change.metadata.ts = metadata.ts
 						already_merged = true
 						moved_changes.push change
 					else if op_start <= change_start
@@ -241,6 +244,7 @@ define [
 						if insert_remaining.length > 0
 							change.op.i = insert_remaining
 							change.op.p = Math.min(change_start, op_start)
+							change.metadata.ts = metadata.ts
 							moved_changes.push change
 						else
 							remove_changes.push change
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee
index f8cf61e760..a105a6df92 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee
@@ -143,6 +143,7 @@ define [
 				@$scope.reviewPanel.entries[change.id] = {
 					content: change.op.i or change.op.d
 					offset: change.op.p
+					metadata: change.metadata
 				}
 			for comment in @changesTracker.comments
 				@$scope.reviewPanel.entries[comment.id] = {