self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Fix #119

Browse Source 
Fix the bug that permit to undo changes from different notes.
I save the editor instance into the state and in the componentWillReceiveProps i reset the undo state
This commit is contained in:
marcosvega91 2017-12-22 14:48:44 +01:00
parent 0926755635
commit 0bf5c9ebdd
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ class NoteTextComponent extends React.Component {
webviewReady: false,
scrollHeight: null,
editorScrollTop: 0,
editor:null
};
this.lastLoadedNoteId_ = null;
@ -167,6 +168,13 @@ class NoteTextComponent extends React.Component {
async componentWillReceiveProps(nextProps) {
if ('noteId' in nextProps && nextProps.noteId !== this.props.noteId) {
await this.reloadNote(nextProps);
const editor=this.state.editor;
if(editor){
const session = editor.getSession();
const undoManager = session.getUndoManager();
undoManager.reset();
session.setUndoManager(undoManager);
}
}
if ('syncStarted' in nextProps && !nextProps.syncStarted && !this.isModified()) {
@ -334,6 +342,10 @@ class NoteTextComponent extends React.Component {
this.scheduleSave();
}
aceEditor_onLoad(editor){
this.setState({editor:editor});
}
async commandAttachFile() {
const noteId = this.props.noteId;
if (!noteId) return;
@ -549,7 +561,6 @@ class NoteTextComponent extends React.Component {
delete editorRootStyle.width;
delete editorRootStyle.height;
delete editorRootStyle.fontSize;
const editor = <AceEditor
value={body}
mode="markdown"
@ -559,6 +570,7 @@ class NoteTextComponent extends React.Component {
height={editorStyle.height + 'px'}
fontSize={editorStyle.fontSize}
showGutter={false}
onLoad={editor => this.aceEditor_onLoad.bind(this)(editor)}
name="note-editor"
wrapEnabled={true}
onScroll={(event) => { this.editor_scroll(); }}