Merge "Fix keyboard shortcuts for non-US keyboards" into stable-2.11
diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
index e2fec27..2625222 100644
--- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
+++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java
@@ -136,15 +136,6 @@
if (mask == 0) {
mask = event.getNativeEvent().getKeyCode();
}
- if (event.isAltKeyDown()) {
- mask |= KeyCommand.M_ALT;
- }
- if (event.isControlKeyDown()) {
- mask |= KeyCommand.M_CTRL;
- }
- if (event.isMetaKeyDown()) {
- mask |= KeyCommand.M_META;
- }
return mask;
}
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
index 4f63425..0894ed8 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
@@ -367,8 +367,8 @@
KeyMap keyMap = KeyMap.create()
.on("A", upToChange(true))
.on("U", upToChange(false))
- .on("[", header.navigate(Direction.PREV))
- .on("]", header.navigate(Direction.NEXT))
+ .on("'['", header.navigate(Direction.PREV))
+ .on("']'", header.navigate(Direction.NEXT))
.on("R", header.toggleReviewed())
.on("O", commentManager.toggleOpenBox(cm))
.on("Enter", commentManager.toggleOpenBox(cm))
