deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-25 01:42:18 +02:00
Code Issues Projects Releases Wiki Activity

Fix autocompleting multiple times not working

Browse source
This commit is contained in:
Pavel Djundik 2018-07-17 11:21:08 +03:00 committed by Pavel Djundik
parent 1bfaef1985
commit 0e7880a049
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
client/js/autocompletion.js
View file

@ -174,19 +174,24 @@ const backgroundColorStrategy = {
function enableAutocomplete(inputRef) {
enabled = true;
let autocompleting = false;
let tabCount = 0;
let lastMatch = "";
let currentMatches = [];
input = $(inputRef);
input.on("input.tabcomplete", () => {
input.on("input.tabcomplete", (e) => {
if (e.detail === "autocomplete") {
return;
}
tabCount = 0;
currentMatches = [];
lastMatch = "";
});
Mousetrap(input.get(0)).bind("tab", (e) => {
if (input.data("autocompleting")) {
if (autocompleting) {
return;
}
@ -218,7 +223,9 @@ function enableAutocomplete(inputRef) {
input.val(text.substr(0, position) + newMatch);
// Propagate change to Vue model
input.get(0).dispatchEvent(new Event("input"));
input.get(0).dispatchEvent(new CustomEvent("input", {
detail: "autocomplete",
}));
lastMatch = newMatch;
tabCount++;
@ -250,11 +257,11 @@ function enableAutocomplete(inputRef) {
});
textcomplete.on("show", () => {
input.data("autocompleting", true);
autocompleting = true;
});
textcomplete.on("hidden", () => {
input.data("autocompleting", false);
autocompleting = false;
});
}

2
client/js/socket-events/init.js
View file

@ -13,7 +13,7 @@ const {vueApp} = require("../vue");
socket.on("init", function(data) {
$("#loading-page-message, #connection-error").text("Rendering…");
let previousActive = vueApp.activeChannel && vueApp.activeChannel.channel.id;
const previousActive = vueApp.activeChannel && vueApp.activeChannel.channel.id;
const networks = new Set(JSON.parse(storage.get("thelounge.networks.collapsed")));