chrome/browser/resources/settings/settings_main/settings_main.js - Issue 2184893002: Settings Router Refactor: Remove route.page legacy property.

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 2184893002: Settings Router Refactor: Remove route.page legacy property. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0217-settings-refactor-settings-menu

Patch Set: fix contains issue. 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/route.js ('k') | chrome/browser/resources/settings/settings_menu/settings_menu.html » ('j') | chrome/browser/resources/settings/settings_menu/settings_menu.html » ('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 95ebfc6a5404287d9b6b9711d98c04c73ec9bffe..8048db978ba14c5bdd4f33bf62dcfef2beedf1b9 100644

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

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

@@ -122,13 +122,13 @@ Polymer({

this.inSubpage_ = newRoute.subpage.length > 0;

this.style.height = this.inSubpage_ ? '100%' : '';

- if (newRoute.page == 'about') {

+ if (settings.Route.ABOUT.contains(newRoute)) {

this.showPages_ = {about: true, basic: false, advanced: false};

} else {

this.showPages_ = {

about: false,

- basic: newRoute.page == 'basic' || !this.inSubpage_,

- advanced: newRoute.page == 'advanced' ||

+ basic: settings.Route.BASIC.contains(newRoute) || !this.inSubpage_,

+ advanced: settings.Route.ADVANCED.contains(newRoute) ||

(!this.inSubpage_ && this.advancedToggleExpanded_),

};