diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 20:48:29 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 20:48:29 +0000 |
| commit | 055a3ea22b955b443292ab4c1befbda3d2ee8cf8 (patch) | |
| tree | e7abfb40d037c5e3fef47552f409578c0a62df26 | |
| parent | 048133e136b0d875e0698b3dbea5b56f5f8d85a5 (diff) | |
| download | chromium_src-055a3ea22b955b443292ab4c1befbda3d2ee8cf8.zip chromium_src-055a3ea22b955b443292ab4c1befbda3d2ee8cf8.tar.gz chromium_src-055a3ea22b955b443292ab4c1befbda3d2ee8cf8.tar.bz2 | |
Merge 258882 "Don't forward all ENTER key to focused pod."
> Don't forward all ENTER key to focused pod.
>
> Single pod is now always a focused pod in account picker and global
> keydown handler should not forward ENTER key to the focused pod when
> the key is targeted to external elements that use ENTER such as INPUT,
> BUTTON and A.
>
> BUG=chrome-os-parter:27167
>
> Review URL: https://codereview.chromium.org/208813008
TBR=xiyuan@chromium.org
Review URL: https://codereview.chromium.org/212883005
git-svn-id: svn://svn.chromium.org/chrome/branches/1847/src@259677 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/chromeos/login/user_pod_row.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/resources/chromeos/login/user_pod_row.js b/chrome/browser/resources/chromeos/login/user_pod_row.js index 4643369..fa340d6 100644 --- a/chrome/browser/resources/chromeos/login/user_pod_row.js +++ b/chrome/browser/resources/chromeos/login/user_pod_row.js @@ -1949,8 +1949,14 @@ cr.define('login', function() { break; case 'Enter': if (this.focusedPod_) { - this.setActivatedPod(this.focusedPod_, e); - e.stopPropagation(); + var targetTag = e.target.tagName; + if (e.target == this.focusedPod_.passwordElement || + (targetTag != 'INPUT' && + targetTag != 'BUTTON' && + targetTag != 'A')) { + this.setActivatedPod(this.focusedPod_, e); + e.stopPropagation(); + } } break; case 'U+001B': // Esc |