OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

don't navigate to next/prev message when editor has modifications 

to prevent losing modifications by accident
pull/21833/head
Bruno Windels 2019-05-24 14:46:34 +02:00
parent bd3dbd1a89
commit fbb79e4686
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/elements/MessageEditor.js
View File

@ -60,6 +60,7 @@ export default class MessageEditor extends React.Component {
}; };
this._editorRef = null; this._editorRef = null;
this._autocompleteRef = null; this._autocompleteRef = null;
this._hasModifications = false;
} }
_getRoom() { _getRoom() {
@ -79,6 +80,7 @@ export default class MessageEditor extends React.Component {
} }
_onInput = (event) => { _onInput = (event) => {
this._hasModifications = true;
const sel = document.getSelection(); const sel = document.getSelection();
const {caret, text} = getCaretOffsetAndText(this._editorRef, sel); const {caret, text} = getCaretOffsetAndText(this._editorRef, sel);
this.model.update(text, event.inputType, caret); this.model.update(text, event.inputType, caret);
@ -128,7 +130,7 @@ export default class MessageEditor extends React.Component {
} else if (event.key === "Escape") { } else if (event.key === "Escape") {
this._cancelEdit(); this._cancelEdit();
} else if (event.key === "ArrowUp") { } else if (event.key === "ArrowUp") {
if (!this._isCaretAtStart()) { if (this._hasModifications || !this._isCaretAtStart()) {
return; return;
} }
const previousEvent = findPreviousEditableEvent(this._getRoom(), this.props.event.getId()); const previousEvent = findPreviousEditableEvent(this._getRoom(), this.props.event.getId());
@ -137,7 +139,7 @@ export default class MessageEditor extends React.Component {
event.preventDefault(); event.preventDefault();
} }
} else if (event.key === "ArrowDown") { } else if (event.key === "ArrowDown") {
if (!this._isCaretAtEnd()) { if (this._hasModifications || !this._isCaretAtEnd()) {
return; return;
} }
const nextEvent = findNextEditableEvent(this._getRoom(), this.props.event.getId()); const nextEvent = findNextEditableEvent(this._getRoom(), this.props.event.getId());