| Index: chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| diff --git a/chrome/browser/resources/settings/settings_page/main_page_behavior.js b/chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| index 3886816a9110fcb731267fad86474ae00c3b1cf4..229e98317b37f48299a3317ac14bb8ac05049ee1 100644
|
| --- a/chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| +++ b/chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| @@ -13,7 +13,7 @@ var MainPageBehaviorImpl = {
|
| /**
|
| * Help CSS to alter style during the horizontal swipe animation.
|
| * Note that this is unrelated to the |currentAnimation_| (which refers to
|
| - * the vertical exapand animation).
|
| + * the vertical expand animation).
|
| */
|
| isSubpageAnimating: {
|
| reflectToAttribute: true,
|
| @@ -35,9 +35,7 @@ var MainPageBehaviorImpl = {
|
| /** @type {?HTMLElement} The scrolling container. */
|
| scroller: null,
|
|
|
| - listeners: {
|
| - 'neon-animation-finish': 'onNeonAnimationFinish_'
|
| - },
|
| + listeners: {'neon-animation-finish': 'onNeonAnimationFinish_'},
|
|
|
| /** @override */
|
| attached: function() {
|
| @@ -81,7 +79,7 @@ var MainPageBehaviorImpl = {
|
| // Scroll to the section except for back/forward. Also scroll for any
|
| // in-page back/forward navigations (from a section or the root page).
|
| // Also always scroll when coming from either the About or root page.
|
| - var scrollToSection = !settings.lastRouteChangeWasPopstate() ||
|
| + var scrollToSection = !settings.wasLastRouteChangePopstate() ||
|
| oldRouteWasSection || oldRoute == settings.Route.BASIC ||
|
| oldRoute == settings.Route.ABOUT;
|
|
|
| @@ -110,7 +108,7 @@ var MainPageBehaviorImpl = {
|
| return;
|
|
|
| if (!inSearchMode)
|
| - this.tryTransitionToSection_(!settings.lastRouteChangeWasPopstate());
|
| + this.tryTransitionToSection_(!settings.wasLastRouteChangePopstate());
|
| },
|
|
|
| /**
|
| @@ -299,7 +297,7 @@ var MainPageBehaviorImpl = {
|
| this.getSection(settings.getCurrentRoute().section);
|
|
|
| // Scroll to the new section or the original position.
|
| - if (newSection && !settings.lastRouteChangeWasPopstate() &&
|
| + if (newSection && !settings.wasLastRouteChangePopstate() &&
|
| !settings.getCurrentRoute().isSubpage()) {
|
| newSection.scrollIntoView();
|
| } else {
|
|
|