MD Settings: Page and animation fixes

chrome/browser/resources/settings/settings_page/settings_animated_pages.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * 'settings-animated-pages' is a container for a page and animated subpages.
  * It provides a set of common behaviors and animations.
  *
  * Example:
@@ skipping 93 matching lines @@
       // For transitioning between subpages at different levels, slide.
       if (newRoute.subpage.length > oldRoute.subpage.length) {
         this.$.animatedPages.exitAnimation = 'slide-left-animation';
         this.$.animatedPages.entryAnimation = 'slide-from-right-animation';
       } else {
         this.$.animatedPages.exitAnimation = 'slide-right-animation';
         this.$.animatedPages.entryAnimation = 'slide-from-left-animation';
       }
     }
 
-    this.$.animatedPages.selected =
-        newRouteIsSubpage ? newRoute.subpage.slice(-1)[0] : 'main';
+    if (newRouteIsSubpage && newRoute.section == this.section)

[dpapad, 2016/05/09 21:34:58]

Nit (optional): Ternary operator could be used here.

this.$.animatedPages.selected =
    (newRouteIsSubpage && newRoute.section == this.section) ?
        newRoute.subpage.slice(-1)[0] : 'main';

[michaelpg, 2016/05/09 23:12:38]

Think I'll keep it as is. I tried it a couple ways and the ternary just never
looked right to me.

+      this.$.animatedPages.selected = newRoute.subpage.slice(-1)[0];
+    else
+      this.$.animatedPages.selected = 'main';
   },
 
   /**
    * Ensures that the template enclosing the subpage is stamped.
    * @private
    */
   ensureSubpageInstance_: function() {
     var id = this.currentRoute.subpage.slice(-1)[0];
     var template = Polymer.dom(this).querySelector(
         'template[name="' + id + '"]');
@@ skipping 18 matching lines @@
    * Buttons in this pageset should use this method to transition to subpages.
    */
   setSubpageChain: function(subpage) {
     this.currentRoute = {
       page: this.currentRoute.page,
       section: subpage.length > 0 ? this.section : '',
       subpage: subpage,
     };
   },
 });