From 6b31268bfa65096b82dd17bd0b28f9c6f451a4dd Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Tue, 14 Aug 2018 15:27:07 +0100
Subject: [PATCH] Scroll to selected history update when coming back from the
 labels view.

---
 .../history/components/historyEntriesList.coffee | 16 ++++++++++++++++
 .../ide/history/components/historyEntry.coffee   |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/services/web/public/coffee/ide/history/components/historyEntriesList.coffee b/services/web/public/coffee/ide/history/components/historyEntriesList.coffee
index 934ca304fe..de4e4f1b92 100644
--- a/services/web/public/coffee/ide/history/components/historyEntriesList.coffee
+++ b/services/web/public/coffee/ide/history/components/historyEntriesList.coffee
@@ -3,6 +3,22 @@ define [
 ], (App) ->
 	historyEntriesListController = ($scope, $element, $attrs) ->
 		ctrl = @ 
+		ctrl.$entryListViewportEl = null
+		_isEntryElVisible = ($entryEl) ->
+			entryElTop = $entryEl.offset().top
+			entryElBottom = entryElTop + $entryEl.outerHeight()
+			entryListViewportElTop = ctrl.$entryListViewportEl.offset().top
+			entryListViewportElBottom = entryListViewportElTop + ctrl.$entryListViewportEl.height()
+			return entryElTop >= entryListViewportElTop and entryElBottom <= entryListViewportElBottom;
+		_getScrollTopPosForEntry = ($entryEl) ->
+			halfViewportElHeight = ctrl.$entryListViewportEl.height() / 2
+			return $entryEl.offset().top - halfViewportElHeight
+		ctrl.onEntryLinked = (entry, $entryEl) ->
+			if entry.selectedTo and entry.selectedFrom and !_isEntryElVisible $entryEl
+				$scope.$applyAsync () ->
+					ctrl.$entryListViewportEl.scrollTop _getScrollTopPosForEntry $entryEl
+		ctrl.$onInit = () ->
+			ctrl.$entryListViewportEl = $element.find "> .history-entries"
 		return
 
 	App.component "historyEntriesList", {
diff --git a/services/web/public/coffee/ide/history/components/historyEntry.coffee b/services/web/public/coffee/ide/history/components/historyEntry.coffee
index 8af726b509..6d5eed53d5 100644
--- a/services/web/public/coffee/ide/history/components/historyEntry.coffee
+++ b/services/web/public/coffee/ide/history/components/historyEntry.coffee
@@ -26,6 +26,8 @@ define [
 				color : "#FFF" 
 			else 
 				color: "hsl(#{ hue }, 70%, 50%)"
+		ctrl.$onInit = () ->
+			ctrl.historyEntriesList.onEntryLinked ctrl.entry, $element.find "> .history-entry"
 		return
 
 	App.component "historyEntry", {
@@ -35,6 +37,8 @@ define [
 			users: "<"
 			onSelect: "&"
 			onLabelDelete: "&"
+		require:
+			historyEntriesList: '^historyEntriesList'
 		controller: historyEntryController
 		templateUrl: "historyEntryTpl"
 	}
\ No newline at end of file