diff options
| author | michaelpg@chromium.org <michaelpg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-26 19:40:36 +0000 |
|---|---|---|
| committer | michaelpg@chromium.org <michaelpg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-26 19:40:36 +0000 |
| commit | 4513880e29b5e8ac334705fe89cb9d558417d4bc (patch) | |
| tree | 4d535d79bfdffdc3641ccb4ac627f0d9c4c8954c | |
| parent | 680228778f8f59e8de1226d88d235d4ab2ec5973 (diff) | |
| download | chromium_src-4513880e29b5e8ac334705fe89cb9d558417d4bc.zip chromium_src-4513880e29b5e8ac334705fe89cb9d558417d4bc.tar.gz chromium_src-4513880e29b5e8ac334705fe89cb9d558417d4bc.tar.bz2 | |
Fix TypeError when closing overlay
Hitting Escape repeatedly to close an overlay can trigger a TypeError
if Escape is pressed again before the overlay is fully hidden.
overlays.js and options_page.js have differing opinions on when an
overlay is visible, so overlays.js will send the Esc event while
the overlay is animating out.
R=estade@chromium.org
Review URL: https://codereview.chromium.org/423583003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285790 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/options/options_page.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/resources/options/options_page.js b/chrome/browser/resources/options/options_page.js index 968bb47..51dd79f 100644 --- a/chrome/browser/resources/options/options_page.js +++ b/chrome/browser/resources/options/options_page.js @@ -355,6 +355,8 @@ cr.define('options', function() { // Blur the active element to ensure any changed pref value is saved. document.activeElement.blur(); var overlay = this.getVisibleOverlay_(); + if (!overlay) + return; // Let the overlay handle the <Esc> if it wants to. if (overlay.handleCancel) { overlay.handleCancel(); |