rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/account-menu-react

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-06-23 15:59:27 -03:00
parent 9c48ee654f 6170bca0d8
commit 7ca1db21c6
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/assets/javascripts/views/editor/editor_view.ts
View File

@@ -105,6 +105,7 @@ class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
public editorValues: EditorValues = { title: '', text: '' }; public editorValues: EditorValues = { title: '', text: '' };
onEditorLoad?: () => void; onEditorLoad?: () => void;
private scrollPosition = 0;
private removeAltKeyObserver?: any; private removeAltKeyObserver?: any;
private removeTrashKeyObserver?: any; private removeTrashKeyObserver?: any;
private removeTabObserver?: any; private removeTabObserver?: any;
@@ -131,6 +132,8 @@ class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
this.editorMenuOnSelect = this.editorMenuOnSelect.bind(this); this.editorMenuOnSelect = this.editorMenuOnSelect.bind(this);
this.onPanelResizeFinish = this.onPanelResizeFinish.bind(this); this.onPanelResizeFinish = this.onPanelResizeFinish.bind(this);
this.setScrollPosition = this.setScrollPosition.bind(this);
this.resetScrollPosition = this.resetScrollPosition.bind(this);
this.onEditorLoad = () => { this.onEditorLoad = () => {
this.application!.getDesktopService().redoSearch(); this.application!.getDesktopService().redoSearch();
}; };
@@ -868,6 +871,20 @@ class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
}); });
} }
setScrollPosition() {
const editor = document.getElementById(
ElementIds.NoteTextEditor
) as HTMLInputElement;
this.scrollPosition = editor.scrollTop;
}
resetScrollPosition() {
const editor = document.getElementById(
ElementIds.NoteTextEditor
) as HTMLInputElement;
editor.scrollTop = this.scrollPosition;
}
onSystemEditorLoad() { onSystemEditorLoad() {
if (this.removeTabObserver) { if (this.removeTabObserver) {
return; return;
@@ -915,6 +932,9 @@ class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
}, },
}); });
editor.addEventListener('scroll', this.setScrollPosition);
editor.addEventListener('input', this.resetScrollPosition);
/** /**
* Handles when the editor is destroyed, * Handles when the editor is destroyed,
* (and not when our controller is destroyed.) * (and not when our controller is destroyed.)
@@ -922,6 +942,9 @@ class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
angular.element(editor).one('$destroy', () => { angular.element(editor).one('$destroy', () => {
this.removeTabObserver?.(); this.removeTabObserver?.();
this.removeTabObserver = undefined; this.removeTabObserver = undefined;
editor.removeEventListener('scroll', this.setScrollPosition);
editor.removeEventListener('scroll', this.resetScrollPosition);
this.scrollPosition = 0;
}); });
} }
} }