chrome/browser/resources/settings/settings_page/settings_animated_pages.js - Issue 2018753002: [MD settings] refine routing function

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 2018753002: [MD settings] refine routing function (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review change Created 4 years, 7 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/basic_page/basic_page.html ('k') | chrome/browser/resources/settings/settings_page_css.html » ('j') | no next file with comments »
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 27869cd148599361af67adf5b853bb64e28549be..f40647ee78002f28f337bab037e4a0dac8b1f90d 100644

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

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

@@ -146,8 +146,16 @@ Polymer({

* Buttons in this pageset should use this method to transition to subpages.

setSubpageChain: function(subpage) {

+ var node = window.event.currentTarget;

+ var page;

+ while (node) {

+ if (node.dataset && node.dataset.page)

+ page = node.dataset.page;

+ // A shadow root has a |host| rather than a |parentNode|.

+ node = node.host || node.parentNode;

+ }

this.currentRoute = {

- page: this.currentRoute.page,

+ page: page,

section: subpage.length > 0 ? this.section : '',

subpage: subpage,

};