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 130a2881cdca9fca8e0c2f5934194daa3c515c59..ce1e943f7f4eb4ace523905e6a708e337ecefdac 100644 |
--- a/chrome/browser/resources/settings/settings_page/main_page_behavior.js |
+++ b/chrome/browser/resources/settings/settings_page/main_page_behavior.js |
@@ -346,7 +346,7 @@ var RoutableBehaviorImpl = { |
if (!element) |
return; |
- if (element.parentNode.host.scrollHeight == 0) { |
+ if (this.scrollHeight == 0) { |
setTimeout(pollForScrollHeight.bind(this), 100); |
return; |
} |
@@ -380,7 +380,7 @@ var RoutableBehaviorImpl = { |
var section = this.getSection_(newRoute.section); |
if (section) |
this.expandSection(section); |
- } else if (newRoute && newRoute.section) { |
+ } else if (newRoute && newRoute.section && !oldRouteIsSubpage) { |
dschuyler
2016/06/06 23:51:42
What is this addition addressing?
michaelpg
2016/06/07 02:55:05
Warning: wall of text that I'm publishing for my n
dschuyler
2016/06/08 00:35:05
That's a lot of indirect logic for folks following
|
this.scrollToSection_(); |
} |
}, |