diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2016-03-08 15:20:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-08 15:20:04 +0000 |
| commit | b99777141ab92961c62c289d96a662462daf89b1 (patch) | |
| tree | 41aa4c4ec0e907354fd36f56da01aa23ac0f86f2 | |
| parent | 0cb2b65c2b67e6cd01fe934170cc2688d1f5b05b (diff) | |
| parent | 04610c1899ed47110fe8a56f1df84f371530f7af (diff) | |
Merge "Fix keyboard shortcuts for non-US keyboards" into stable-2.11
| -rw-r--r-- | gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java | 9 | ||||
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java | 4 |
2 files changed, 2 insertions, 11 deletions
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 e2fec27a45..26252226d7 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 @@ public class KeyCommandSet implements KeyPressHandler { 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 4f634252ed..0894ed8406 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 @@ public class SideBySide extends Screen { 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)) |