chrome/browser/resources/settings/settings_main/settings_main.js - Issue 2106013002: Move settings-section animations into setting-section, make better

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_main/settings_main.js

Issue 2106013002: Move settings-section animations into setting-section, make better (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Transitions

Patch Set: rebase, minor fix Created 4 years, 5 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/settings_main/settings_main.html ('k') | chrome/browser/resources/settings/settings_page/compiled_resources2.gyp » ('j') | chrome/browser/resources/settings/settings_page/expand_card_transition.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/settings_main/settings_main.js

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

index 254f2614a20cbdb195c39564ef9c5b7137b97d2e..4364f49ccf4e898cac8d44784917f6d10abb5228 100644

--- a/chrome/browser/resources/settings/settings_main/settings_main.js

+++ b/chrome/browser/resources/settings/settings_main/settings_main.js

@@ -114,15 +114,23 @@ Polymer({

this.showAboutPage_ = newRoute.page == 'about';

- this.showAdvancedToggle_ = !this.showAboutPage_ && !isSubpage;

+ this.showAdvancedToggle_ = !this.showAboutPage_;

- this.showBasicPage_ = this.showAdvancedToggle_ || newRoute.page == 'basic';

+ this.showBasicPage_ = !this.showAboutPage_;

- this.showAdvancedPage_ =

+ this.showAdvancedPage_ = this.showAdvancedPage_ ||

(this.isAdvancedMenuOpen_ && this.showAdvancedToggle_) ||

newRoute.page == 'advanced';

+ },

+ subpageExpanded_: function() {

+ this.showBasicPage_ = this.currentRoute.page == 'basic';

+ this.showAdvancedPage_ = !this.showBasicPage_;

+ this.showAdvancedToggle_ = false;

+ },

- this.style.height = isSubpage ? '100%' : '';

+ subpageCollapsing_: function() {

+ this.currentRouteChanged_(this.currentRoute);

/** @private */