Merge pull request #2262 from realies/master

stop propagation, prevent input history call when alt is involved

client/js/keybinds.js

@@ -55,6 +55,8 @@ Mousetrap.bind([
 	}
 
 	channels.eq(target).click();
+
+	return false;
 });
 
 Mousetrap.bind([
@@ -87,6 +89,8 @@ Mousetrap.bind([
 	}
 
 	lobbies.eq(target).click();
+
+	return false;
 });
 
 Mousetrap.bind([

client/js/libs/jquery/inputhistory.js

@@ -56,7 +56,7 @@ import jQuery from "jquery";
 			case 38: // Up
 			case 40: // Down
 				// 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;
 				}