diff options
| author | rsadam@chromium.org <rsadam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 18:11:50 +0000 |
|---|---|---|
| committer | rsadam@chromium.org <rsadam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 18:11:50 +0000 |
| commit | b73f88063b30bccc4b758f3dad733c3250b601d8 (patch) | |
| tree | 6dcb79dae242ec0082d838f51fa5e53ed25ea570 /ui | |
| parent | 056e814596e9a6b36d9665daace3411436f06795 (diff) | |
| download | chromium_src-b73f88063b30bccc4b758f3dad733c3250b601d8.zip chromium_src-b73f88063b30bccc4b758f3dad733c3250b601d8.tar.gz chromium_src-b73f88063b30bccc4b758f3dad733c3250b601d8.tar.bz2 | |
Chording now ends if the shift key-up was on the key that started the chording.
BUG=297586
Review URL: https://codereview.chromium.org/24607002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/keyboard/resources/elements/kb-shift-key.html | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ui/keyboard/resources/elements/kb-shift-key.html b/ui/keyboard/resources/elements/kb-shift-key.html index bb874f0..db80bf5 100644 --- a/ui/keyboard/resources/elements/kb-shift-key.html +++ b/ui/keyboard/resources/elements/kb-shift-key.html @@ -51,10 +51,15 @@ if (state == KEY_STATES.PRESSED) { state = KEY_STATES.TAPPED; } else if (state == KEY_STATES.CHORDING) { - // Resets shift state. - state = KEY_STATES.UNLOCKED; - // TODO(rsadam@): Only end chording if the key-up is on the same - // shift key that started the chording. + // Leaves chording only if the shift key that triggered + // it is released. + // TODO (rsadam@): Fix edge case: If we enter chording while + // pressing another key, will not leave chording upon shift + // release. + if (event.isPrimary) + state = KEY_STATES.UNLOCKED; + else + return; } this.super(); }, |