From 5f8ed420069a480e36b294f72d72229f75d2ef7d Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Fri, 21 Mar 2014 14:23:07 +0000
Subject: [PATCH] Show blank diff for files that haven't changed

---
 .../public/coffee/track-changes/DiffView.coffee | 17 +++++++++++------
 .../track-changes/TrackChangesManager.coffee    |  4 ----
 .../coffee/track-changes/models/Diff.coffee     |  5 ++++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/services/web/public/coffee/track-changes/DiffView.coffee b/services/web/public/coffee/track-changes/DiffView.coffee
index 1ae4357dd1..0ac6002e8c 100644
--- a/services/web/public/coffee/track-changes/DiffView.coffee
+++ b/services/web/public/coffee/track-changes/DiffView.coffee
@@ -20,6 +20,17 @@ define [
 		render: ->
 			diff = @model.get("diff")
 			return unless diff?
+
+			changes = @getNumberOfChanges()
+			html = Mustache.to_html @template, {
+				changes: "#{changes} change#{if changes == 1 then "" else "s"}"
+				name: @model.get("doc")?.get("name")
+			}
+			@$el.html(html)
+
+			if !@model.get("from")? or !@model.get("to")? or changes == 0
+				@$(".restore").hide()
+
 			@createAceEditor()
 			@aceEditor.setValue(@getPlainDiffContent())
 			@aceEditor.clearSelection()
@@ -36,12 +47,6 @@ define [
 			@undelegateEvents()
 
 		createAceEditor: () ->
-			changes = @getNumberOfChanges()
-			html = Mustache.to_html @template, {
-				changes: "#{changes} change#{if changes > 1 then "s" else ""}"
-				name: @model.get("doc")?.get("name")
-			}
-			@$el.html(html)
 			@$editor = @$(".track-changes-diff-editor")
 			@$el.append(@$editor)
 			@aceEditor = Ace.edit(@$editor[0])
diff --git a/services/web/public/coffee/track-changes/TrackChangesManager.coffee b/services/web/public/coffee/track-changes/TrackChangesManager.coffee
index 1f610329c7..1f3b66bb1d 100644
--- a/services/web/public/coffee/track-changes/TrackChangesManager.coffee
+++ b/services/web/public/coffee/track-changes/TrackChangesManager.coffee
@@ -113,10 +113,6 @@ define [
 
 			{from, to, start_ts, end_ts} = @_findDocVersionsRangeInSelection(@doc_id, fromIndex, toIndex)
 
-			if !from? or !to?
-				console.log "No diff, should probably just show latest version"
-				return
-
 			@diff = new Diff({
 				project_id: @project_id
 				doc_id: @doc_id
diff --git a/services/web/public/coffee/track-changes/models/Diff.coffee b/services/web/public/coffee/track-changes/models/Diff.coffee
index 879373e2dc..d8ee48726f 100644
--- a/services/web/public/coffee/track-changes/models/Diff.coffee
+++ b/services/web/public/coffee/track-changes/models/Diff.coffee
@@ -8,7 +8,10 @@ define [
 			@set "doc", @ide.fileTreeManager.getEntity(@get("doc_id"))
 
 		url: () ->
-			"/project/#{@get("project_id")}/doc/#{@get("doc_id")}/diff?from=#{@get("from")}&to=#{@get("to")}"
+			url = "/project/#{@get("project_id")}/doc/#{@get("doc_id")}/diff"
+			if @get("from")? and @get("to")?
+				url += "?from=#{@get("from")}&to=#{@get("to")}"
+			return url
 
 		parse: (diff) ->
 			for entry in diff.diff