From 088d27f22b528b22c5fc27999ddc25480e94232c Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Mon, 21 Jul 2014 11:50:02 +0100
Subject: [PATCH] Make sure gotoLine works when changing session

---
 services/web/public/coffee/ide/editor/EditorManager.coffee      | 1 -
 .../web/public/coffee/ide/editor/directives/aceEditor.coffee    | 1 -
 .../aceEditor/cursor-position/CursorPositionManager.coffee      | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/services/web/public/coffee/ide/editor/EditorManager.coffee b/services/web/public/coffee/ide/editor/EditorManager.coffee
index 1298d837e6..57f4f63091 100644
--- a/services/web/public/coffee/ide/editor/EditorManager.coffee
+++ b/services/web/public/coffee/ide/editor/EditorManager.coffee
@@ -9,7 +9,6 @@ define [
 				sharejs_doc: null
 				open_doc_id: null
 				opening: true
-				gotoLine: null
 			}
 
 			@$scope.$on "entity:selected", (event, entity) =>
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
index 06315f917d..26cb5ced1e 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
@@ -33,7 +33,6 @@ define [
 				highlights: "="
 				text: "="
 				readOnly: "="
-				gotoLine: "="
 				annotations: "="
 				navigateHighlights: "="
 			}
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
index ee35af07df..b058620c47 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
@@ -27,7 +27,7 @@ define [], () ->
 				if value?
 					setTimeout () =>
 						@gotoLine(value)
-					, 0
+					, 10 # Hack: Must happen after @gotoStoredPosition
 
 		storeScrollTopPosition: (session) ->
 			if @doc_id?