mirror of
https://github.com/thelounge/thelounge
synced 2024-11-26 22:10:22 +00:00
Merge pull request #2262 from realies/master
stop propagation, prevent input history call when alt is involved
This commit is contained in:
commit
d7d8a51332
2 changed files with 5 additions and 1 deletions
|
@ -55,6 +55,8 @@ Mousetrap.bind([
|
||||||
}
|
}
|
||||||
|
|
||||||
channels.eq(target).click();
|
channels.eq(target).click();
|
||||||
|
|
||||||
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
Mousetrap.bind([
|
Mousetrap.bind([
|
||||||
|
@ -87,6 +89,8 @@ Mousetrap.bind([
|
||||||
}
|
}
|
||||||
|
|
||||||
lobbies.eq(target).click();
|
lobbies.eq(target).click();
|
||||||
|
|
||||||
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
Mousetrap.bind([
|
Mousetrap.bind([
|
||||||
|
|
2
client/js/libs/jquery/inputhistory.js
vendored
2
client/js/libs/jquery/inputhistory.js
vendored
|
@ -56,7 +56,7 @@ import jQuery from "jquery";
|
||||||
case 38: // Up
|
case 38: // Up
|
||||||
case 40: // Down
|
case 40: // Down
|
||||||
// NOTICE: This is specific to The Lounge.
|
// NOTICE: This is specific to The Lounge.
|
||||||
if (e.ctrlKey || e.metaKey || self.data("autocompleting")) {
|
if (e.ctrlKey || e.altKey || e.metaKey || self.data("autocompleting")) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue