Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Desktop: Improve how new notes are created to make it more reliable

pull/1175/head
Laurent Cozic 2019-01-30 18:06:47 +00:00
parent a7aed1f93a
commit bda3ea9a35
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,9 +104,9 @@ class NoteTextComponent extends React.Component {
} }
} }
this.onAlarmChange_ = (event) => { if (event.noteId === this.props.noteId) this.reloadNote(this.props); } this.onAlarmChange_ = (event) => { if (event.noteId === this.props.noteId) this.scheduleReloadNote(this.props); }
this.onNoteTypeToggle_ = (event) => { if (event.noteId === this.props.noteId) this.reloadNote(this.props); } this.onNoteTypeToggle_ = (event) => { if (event.noteId === this.props.noteId) this.scheduleReloadNote(this.props); }
this.onTodoToggle_ = (event) => { if (event.noteId === this.props.noteId) this.reloadNote(this.props); } this.onTodoToggle_ = (event) => { if (event.noteId === this.props.noteId) this.scheduleReloadNote(this.props); }
this.onEditorPaste_ = async (event = null) => { this.onEditorPaste_ = async (event = null) => {
const formats = clipboard.availableFormats(); const formats = clipboard.availableFormats();
@ -215,7 +215,7 @@ class NoteTextComponent extends React.Component {
this.externalEditWatcher_noteChange = (event) => { this.externalEditWatcher_noteChange = (event) => {
if (!this.state.note || !this.state.note.id) return; if (!this.state.note || !this.state.note.id) return;
if (event.id === this.state.note.id) { if (event.id === this.state.note.id) {
this.reloadNote(this.props); this.scheduleReloadNote(this.props);
} }
} }
@ -401,6 +401,20 @@ class NoteTextComponent extends React.Component {
}, 500); }, 500);
} }
scheduleReloadNote(props, options = null) {
if (this.scheduleReloadNoteIID_) {
clearTimeout(this.scheduleReloadNoteIID_);
this.scheduleReloadNoteIID_ = null;
}
this.scheduleReloadNoteIID_ = setTimeout(() => {
this.reloadNote(props, options);
}, 100);
}
// Generally, reloadNote() should not be called directly so that it's not called multiple times
// from multiple places within a short interval of time. Instead use scheduleReloadNote() to
// delay reloading a bit and make sure that only one reload operation is performed.
async reloadNote(props, options = null) { async reloadNote(props, options = null) {
if (!options) options = {}; if (!options) options = {};
if (!('noReloadIfLocalChanges' in options)) options.noReloadIfLocalChanges = false; if (!('noReloadIfLocalChanges' in options)) options.noReloadIfLocalChanges = false;
@ -538,9 +552,9 @@ class NoteTextComponent extends React.Component {
async componentWillReceiveProps(nextProps) { async componentWillReceiveProps(nextProps) {
if (nextProps.newNote) { if (nextProps.newNote) {
await this.reloadNote(nextProps); await this.scheduleReloadNote(nextProps);
} else if ('noteId' in nextProps && nextProps.noteId !== this.props.noteId) { } else if ('noteId' in nextProps && nextProps.noteId !== this.props.noteId) {
await this.reloadNote(nextProps); await this.scheduleReloadNote(nextProps);
} else if ('noteTags' in nextProps && this.areNoteTagsModified(nextProps.noteTags, this.state.noteTags)) { } else if ('noteTags' in nextProps && this.areNoteTagsModified(nextProps.noteTags, this.state.noteTags)) {
this.setState({ this.setState({
noteTags: nextProps.noteTags noteTags: nextProps.noteTags
@ -548,7 +562,7 @@ class NoteTextComponent extends React.Component {
} }
if ('syncStarted' in nextProps && !nextProps.syncStarted && !this.isModified()) { if ('syncStarted' in nextProps && !nextProps.syncStarted && !this.isModified()) {
await this.reloadNote(nextProps, { noReloadIfLocalChanges: true }); await this.scheduleReloadNote(nextProps, { noReloadIfLocalChanges: true });
} }
if (nextProps.windowCommand) { if (nextProps.windowCommand) {