chrome/browser/resources/settings/settings_page/settings_animated_pages.js - Issue 1965553002: MD Settings: Page and animation fixes

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 1965553002: MD Settings: Page and animation fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« chrome/browser/resources/settings/settings_page/main_page_behavior.html ('K') | « chrome/browser/resources/settings/settings_page/main_page_behavior.html ('k') | no next file » | 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 08a561a26c6827d6d19cfd1f6e281f80f17dc643..27869cd148599361af67adf5b853bb64e28549be 100644

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

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

@@ -111,8 +111,10 @@ Polymer({

}

- this.$.animatedPages.selected =

- newRouteIsSubpage ? newRoute.subpage.slice(-1)[0] : 'main';

+ if (newRouteIsSubpage && newRoute.section == this.section)

dpapad 2016/05/09 21:34:58 Nit (optional): Ternary operator could be used her

michaelpg 2016/05/09 23:12:38 Think I'll keep it as is. I tried it a couple ways

+ this.$.animatedPages.selected = newRoute.subpage.slice(-1)[0];

+ else

+ this.$.animatedPages.selected = 'main';

/**