Skip to content

Commit cb6d2a1

Browse files
committed
Bugfix. Don't autocomplete MUC mentions without @
1 parent 23399cd commit cb6d2a1

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/plugins/muc-views/message-form.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default class MUCMessageForm extends MessageForm {
3030
}
3131

3232
initMentionAutoComplete() {
33-
this.mention_auto_complete = new AutoComplete(this, {
33+
this.auto_complete = new AutoComplete(this, {
3434
auto_first: true,
3535
min_chars: api.settings.get("muc_mention_autocomplete_min_chars"),
3636
match_current_word: true,
@@ -41,7 +41,7 @@ export default class MUCMessageForm extends MessageForm {
4141
include_triggers: [],
4242
item: (text, input) => getAutoCompleteListItem(this.model, text, input),
4343
});
44-
this.mention_auto_complete.on("suggestion-box-selectcomplete", () => (this.auto_completing = false));
44+
this.auto_complete.on("suggestion-box-selectcomplete", () => (this.auto_completing = false));
4545
}
4646

4747
getAutoCompleteList() {
@@ -52,7 +52,7 @@ export default class MUCMessageForm extends MessageForm {
5252
* @param {KeyboardEvent} ev
5353
*/
5454
onKeyDown(ev) {
55-
if (this.shouldAutoComplete() && this.mention_auto_complete.onKeyDown(ev)) {
55+
if (this.shouldAutoComplete() && this.auto_complete.onKeyDown(ev)) {
5656
return;
5757
}
5858
super.onKeyDown(ev);
@@ -62,7 +62,9 @@ export default class MUCMessageForm extends MessageForm {
6262
* @param {KeyboardEvent} ev
6363
*/
6464
onKeyUp(ev) {
65-
if (this.shouldAutoComplete()) this.mention_auto_complete.evaluate(ev);
65+
if (this.shouldAutoComplete() && this.auto_complete.auto_completing) {
66+
this.auto_complete.evaluate(ev);
67+
}
6668
super.onKeyUp(ev);
6769
}
6870
}

src/shared/autocomplete/autocomplete.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ export class AutoComplete extends EventEmitter(Object) {
228228
this.select();
229229
return true;
230230
} else if (ev.key === converse.keycodes.ESCAPE) {
231-
this.close({'reason': 'esc'});
231+
this.close({ reason: 'esc' });
232232
return true;
233233
} else if ([converse.keycodes.UP_ARROW, converse.keycodes.DOWN_ARROW].includes(ev.key)) {
234234
ev.preventDefault();

src/types/plugins/muc-views/message-form.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export default class MUCMessageForm extends MessageForm {
44
*/
55
shouldAutoComplete(): boolean;
66
initMentionAutoComplete(): void;
7-
mention_auto_complete: AutoComplete;
7+
auto_complete: AutoComplete;
88
auto_completing: boolean;
99
getAutoCompleteList(): any;
1010
/**

0 commit comments

Comments
 (0)