From a32645cdebe5625884ab2a89447986f8aa99da46 Mon Sep 17 00:00:00 2001 From: azivner Date: Mon, 24 Dec 2018 09:47:00 +0100 Subject: [PATCH] fix scrolling to the top of detail after switching note --- src/public/javascripts/services/note_detail.js | 2 +- src/public/javascripts/services/note_detail_code.js | 3 ++- src/public/javascripts/services/note_detail_file.js | 3 ++- src/public/javascripts/services/note_detail_image.js | 3 ++- src/public/javascripts/services/note_detail_relation_map.js | 3 ++- src/public/javascripts/services/note_detail_render.js | 3 ++- src/public/javascripts/services/note_detail_search.js | 3 ++- src/public/javascripts/services/note_detail_text.js | 3 ++- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/public/javascripts/services/note_detail.js b/src/public/javascripts/services/note_detail.js index fffee5dd4..60d778e19 100644 --- a/src/public/javascripts/services/note_detail.js +++ b/src/public/javascripts/services/note_detail.js @@ -223,7 +223,7 @@ async function loadNoteDetail(noteId) { treeService.setBranchBackgroundBasedOnProtectedStatus(noteId); // after loading new note make sure editor is scrolled to the top - $noteDetailWrapper.scrollTop(0); + getComponent(currentNote.type).scrollToTop(); $scriptArea.empty(); diff --git a/src/public/javascripts/services/note_detail_code.js b/src/public/javascripts/services/note_detail_code.js index d90aa68ad..555be8432 100644 --- a/src/public/javascripts/services/note_detail_code.js +++ b/src/public/javascripts/services/note_detail_code.js @@ -107,5 +107,6 @@ export default { if (codeEditor) { codeEditor.setValue(''); } - } + }, + scrollToTop: () => $component.scrollTop(0) } diff --git a/src/public/javascripts/services/note_detail_file.js b/src/public/javascripts/services/note_detail_file.js index dcdbc3c2c..c8794db6a 100644 --- a/src/public/javascripts/services/note_detail_file.js +++ b/src/public/javascripts/services/note_detail_file.js @@ -53,5 +53,6 @@ export default { getContent: () => null, focus: () => null, onNoteChange: () => null, - cleanup: () => null + cleanup: () => null, + scrollToTop: () => null } \ No newline at end of file diff --git a/src/public/javascripts/services/note_detail_image.js b/src/public/javascripts/services/note_detail_image.js index ab67a468c..b7e172e62 100644 --- a/src/public/javascripts/services/note_detail_image.js +++ b/src/public/javascripts/services/note_detail_image.js @@ -71,5 +71,6 @@ export default { getContent: () => null, focus: () => null, onNoteChange: () => null, - cleanup: () => null + cleanup: () => null, + scrollToTop: () => $component.scrollTop(0) } \ No newline at end of file diff --git a/src/public/javascripts/services/note_detail_relation_map.js b/src/public/javascripts/services/note_detail_relation_map.js index 400c10cd2..0c54b7694 100644 --- a/src/public/javascripts/services/note_detail_relation_map.js +++ b/src/public/javascripts/services/note_detail_relation_map.js @@ -566,5 +566,6 @@ export default { getContent: () => JSON.stringify(mapData), focus: () => null, onNoteChange: () => null, - cleanup + cleanup, + scrollToTop: () => null } \ No newline at end of file diff --git a/src/public/javascripts/services/note_detail_render.js b/src/public/javascripts/services/note_detail_render.js index 1fcfd4364..ce1735667 100644 --- a/src/public/javascripts/services/note_detail_render.js +++ b/src/public/javascripts/services/note_detail_render.js @@ -37,5 +37,6 @@ export default { getContent: () => "", focus: () => null, onNoteChange: () => null, - cleanup: () => $noteDetailRenderContent.empty() + cleanup: () => $noteDetailRenderContent.empty(), + scrollToTop: () => $component.scrollTop(0) } \ No newline at end of file diff --git a/src/public/javascripts/services/note_detail_search.js b/src/public/javascripts/services/note_detail_search.js index c0c2849b9..0015bf486 100644 --- a/src/public/javascripts/services/note_detail_search.js +++ b/src/public/javascripts/services/note_detail_search.js @@ -30,5 +30,6 @@ export default { show, focus: () => null, onNoteChange: () => null, - cleanup: () => null + cleanup: () => null, + scrollToTop: () => null } \ No newline at end of file diff --git a/src/public/javascripts/services/note_detail_text.js b/src/public/javascripts/services/note_detail_text.js index 64da5085a..e652d5b14 100644 --- a/src/public/javascripts/services/note_detail_text.js +++ b/src/public/javascripts/services/note_detail_text.js @@ -74,5 +74,6 @@ export default { if (textEditor) { textEditor.setData(''); } - } + }, + scrollToTop: () => $component.scrollTop(0) } \ No newline at end of file