self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-11 11:12:03 +02:00
Code Issues Releases Activity

Desktop: Fixed restored scroll position when only viewer is visible

Browse Source
This commit is contained in:
Laurent Cozic 2019-02-08 08:28:27 +00:00
parent 69b4b4d1f4
commit da3589149d
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ElectronClient/app/gui/NoteText.jsx
View File

@ -504,11 +504,10 @@ class NoteTextComponent extends React.Component {
this.editor_.editor.clearSelection();
this.editor_.editor.moveCursorTo(0,0);
if (scrollPercent) {
setTimeout(() => {
this.setEditorPercentScroll(scrollPercent);
}, 10);
}
setTimeout(() => {
this.setEditorPercentScroll(scrollPercent ? scrollPercent : 0);
this.setViewerPercentScroll(scrollPercent ? scrollPercent : 0);
}, 10);
}
}
@ -742,11 +741,31 @@ class NoteTextComponent extends React.Component {
}
setEditorPercentScroll(p) {
const noteId = this.props.noteId;
if (noteId) {
this.props.dispatch({
type: 'EDITOR_SCROLL_PERCENT_SET',
noteId: noteId,
percent: p,
});
}
this.editorSetScrollTop(p * this.editorMaxScroll());
}
setViewerPercentScroll(p) {
this.webview_.send('setPercentScroll', p);
const noteId = this.props.noteId;
if (noteId) {
this.props.dispatch({
type: 'EDITOR_SCROLL_PERCENT_SET',
noteId: noteId,
percent: p,
});
}
if (this.webview_) this.webview_.send('setPercentScroll', p);
}
editor_scroll() {
@ -758,16 +777,6 @@ class NoteTextComponent extends React.Component {
const m = this.editorMaxScroll();
const percent = m ? this.editorScrollTop() / m : 0;
const noteId = this.props.noteId;
if (noteId) {
this.props.dispatch({
type: 'EDITOR_SCROLL_PERCENT_SET',
noteId: noteId,
percent: percent,
});
}
this.setViewerPercentScroll(percent);
}
@ -1628,7 +1637,7 @@ class NoteTextComponent extends React.Component {
if (this.props.selectedNoteIds.length > 1) {
return this.renderMultiNotes(rootStyle);
} else if (!note || !!note.encryption_applied) {
} else if (!note || !!note.encryption_applied || (note && !this.props.newNote && this.props.noteId && note.id !== this.props.noteId)) { // note.id !== props.noteId is when the note has not been loaded yet, and the previous one is still in the state
return this.renderNoNotes(rootStyle);
}

2
ReactNativeClient/lib/WelcomeUtils.js
View File

@ -18,9 +18,7 @@ class WelcomeUtils {
const folderAssets = welcomeAssets.folders;
const tempDir = Setting.value('resourceDir');
// TODO: Update BaseApplication
// TODO: Update mobile root.js
// TODO: Finish Welcome notes
for (let i = 0; i < folderAssets.length; i++) {
const folderAsset = folderAssets[i];