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

put caret after replaced part if no caretOffset is given by autocomplete

pull/21833/head
Bruno Windels 2019-05-09 20:37:45 +02:00
parent 1a577eed11
commit 2c3453d307
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/editor/autocomplete.js
View File

@ -28,7 +28,7 @@ export default class AutocompleteWrapperModel {
this._getAutocompleterComponent().onEscape(e);
this._updateCallback({
replacePart: new PlainPart(this._queryPart.text),
replaceCaret: this._queryOffset,
caretOffset: this._queryOffset,
close: true,
});
}
@ -61,7 +61,7 @@ export default class AutocompleteWrapperModel {
if (!completion) {
this._updateCallback({
replacePart: this._queryPart,
replaceCaret: this._queryOffset,
caretOffset: this._queryOffset,
});
} else {
this._updateCallback({

7
src/editor/model.js
View File

@ -123,7 +123,7 @@ export default class EditorModel {
}
}
_onAutoComplete = ({replacePart, replaceCaret, close}) => {
_onAutoComplete = ({replacePart, caretOffset, close}) => {
if (replacePart) {
this._replacePart(this._autoCompletePartIdx, replacePart);
}
@ -132,7 +132,10 @@ export default class EditorModel {
this._autoComplete = null;
this._autoCompletePartIdx = null;
}
this._updateCallback(new DocumentPosition(index, replaceCaret));
if (caretOffset === undefined) {
caretOffset = replacePart.text.length;
}
this._updateCallback(new DocumentPosition(index, caretOffset));
}
/*