chrome/browser/resources/settings/settings_page/settings_animated_pages.js - Issue 2813033004: MD Settings: Restore focus after exiting Content settings sub-subpages.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/settings/settings_page/settings_animated_pages.js

Issue 2813033004: MD Settings: Restore focus after exiting Content settings sub-subpages. (Closed)

Patch Set: Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/privacy_page/privacy_page.html ('k') | chrome/browser/resources/settings/site_settings_page/site_settings_page.html » ('j') | chrome/browser/resources/settings/site_settings_page/site_settings_page.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/settings_page/settings_animated_pages.js

diff --git a/chrome/browser/resources/settings/settings_page/settings_animated_pages.js b/chrome/browser/resources/settings/settings_page/settings_animated_pages.js

index 18fe508cefda526a0384328fa6b00ee5bbad9dee..785d23ac5713757faf09d247a9924b0bc29f861d 100644

--- a/chrome/browser/resources/settings/settings_page/settings_animated_pages.js

+++ b/chrome/browser/resources/settings/settings_page/settings_animated_pages.js

@@ -56,8 +56,14 @@ Polymer({

* @private

onIronSelect_: function(e) {

- if (!this.focusConfig || !this.previousRoute_ ||

- e.detail.item.tagName != 'NEON-ANIMATABLE') {

+ if (!this.focusConfig || !this.previousRoute_)

+ return;

+ if (e.detail.item.tagName != 'NEON-ANIMATABLE' &&

+ // Don't handle iron-select events from any subpage except from the

+ // SITE_SETTINGS subpage.

+ !(e.detail.item.tagName == 'SETTINGS-SUBPAGE' &&

+ e.detail.item.id == 'site-settings')) {

Dan Beam 2017/04/12 01:05:26 !e.detail.item.matches('neon-animatable, settings-

dpapad 2017/04/12 03:22:52 Done.

return;

}