From b70e63e893faf2e75f4309ef678070cc0e070d23 Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Fri, 22 Apr 2022 10:43:26 +0100 Subject: [PATCH] Focus the editor after restoring a stored cursor position (#7628) GitOrigin-RevId: d4564f14503957a0fc8a02cef21064777e2e961d --- .../aceEditor/cursor-position/CursorPositionAdapter.js | 4 ++++ .../aceEditor/cursor-position/CursorPositionManager.js | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/services/web/frontend/js/ide/editor/directives/aceEditor/cursor-position/CursorPositionAdapter.js b/services/web/frontend/js/ide/editor/directives/aceEditor/cursor-position/CursorPositionAdapter.js index f136002562..046099774f 100644 --- a/services/web/frontend/js/ide/editor/directives/aceEditor/cursor-position/CursorPositionAdapter.js +++ b/services/web/frontend/js/ide/editor/directives/aceEditor/cursor-position/CursorPositionAdapter.js @@ -50,4 +50,8 @@ export default CursorPositionAdapter = class CursorPositionAdapter { const position = EditorShareJsCodec.shareJsOffsetToRowColumn(offset, lines) return this.gotoLine(position.row + 1, position.column) } + + focus() { + this.editor.focus() + } } diff --git a/services/web/frontend/js/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.js b/services/web/frontend/js/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.js index 663e163ad3..3f49ebc873 100644 --- a/services/web/frontend/js/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.js +++ b/services/web/frontend/js/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.js @@ -113,6 +113,7 @@ export default CursorPositionManager = class CursorPositionManager { } const pos = this.localStorage(`doc.position.${this.doc_id}`) || {} this.adapter.setCursor(pos) - return this.adapter.setEditorScrollPosition(pos) + this.adapter.setEditorScrollPosition(pos) + this.adapter.focus() } }