[MD settings] redesign of side nav

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

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 a7070d055de7346ce2f20152e1dde8525681c5d1..f68192c3f195d484a559a82c6dff6f5414706442 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.js
+++ b/chrome/browser/resources/settings/settings_main/settings_main.js
@@ -5,18 +5,14 @@
 /**
  * @fileoverview
  * 'settings-main' displays the selected settings page.
- *
- * Example:
- *
- *     <settings-main pages="[[pages]]" selected-page-id="{{selectedId}}">
- *     </settings-main>
- *
- * See settings-drawer for example of use in 'paper-drawer-panel'.
  */
 Polymer({
   is: 'settings-main',
 
   properties: {
+    /** @private */
+    isAdvancedMenuOpen_: Boolean,
+
     /**
      * Preferences state.
      *
@@ -29,6 +25,7 @@ Polymer({
 
     /**
      * The current active route.
+     * @type {!SettingsRoute}
      */
     currentRoute: {
       type: Object,
@@ -40,19 +37,43 @@ Polymer({
     showAdvancedPage_: Boolean,
 
     /** @private */
+    showAdvancedToggle_: Boolean,
+
+    /** @private */
     showBasicPage_: Boolean,
 
     /** @private */
     showAboutPage_: Boolean,
   },
 
+  attached: function() {
+    document.addEventListener('toggle-advanced-page', function(e) {
+      this.showAdvancedPage_ = e.detail;
+      this.isAdvancedMenuOpen_ = e.detail;

[Dan Beam, 2016/06/02 01:28:19]

does this compile?  do you need to cast |e| to a CustomEvent?

[dschuyler, 2016/06/02 23:23:55]

I added a compiled_resources2.gyp to test this.
e.detail is accepted as a bool without a cast.

+    }.bind(this));
+  },
+
   /**
    * @param {!SettingsRoute} newRoute
    * @private
    */
-  currentRouteChanged_: function(newRoute) {
+  currentRouteChanged_: function(newRoute, oldRoute) {
+    var isSubpage = !!newRoute.subpage.length;
+
     this.showAboutPage_ = newRoute.page == 'about';
-    this.showAdvancedPage_ = newRoute.page == 'advanced';
-    this.showBasicPage_ = newRoute.page == 'basic';
+
+    this.showAdvancedToggle_ = !this.showAboutPage_ && !isSubpage;
+
+    this.showBasicPage_ = this.showAdvancedToggle_ || newRoute.page == 'basic';
+
+    this.showAdvancedPage_ = this.isAdvancedMenuOpen_ &&
+        this.showAdvancedToggle_ || newRoute.page == 'advanced';

[Dan Beam, 2016/06/02 01:28:20]

add extra parens cuz ambiguity

[dschuyler, 2016/06/02 23:23:55]

Done.

+
+    this.$.pageContainer.style.height = (isSubpage ? '100%' : '');

[Dan Beam, 2016/06/02 01:28:19]

drop extra parens

[dschuyler, 2016/06/02 23:23:55]

Done.

+  },
+
+  /** @private */
+  toggleAdvancedPage_: function() {
+    this.fire('toggle-advanced-page', !this.isAdvancedMenuOpen_);
   },
 });