Settings Router Refactor: Remove route.page legacy property.

chrome/browser/resources/settings/route.js

 // Copyright 2016 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.
 
 cr.define('settings', function() {
   /**
    * Class for navigable routes. May only be instantiated within this file.
    * @constructor
    * @param {string} path
    * @private
    */
   var Route = function(path) {
     this.path = path;
 
     /** @type {?settings.Route} */
     this.parent = null;
 
     // Below are all legacy properties to provide compatibility with the old
     // routing system. TODO(tommycli): Remove once routing refactor complete.
-    this.page = '';
     this.section = '';
     /** @type {!Array<string>} */ this.subpage = [];
   };
 
   Route.prototype = {
     /**
      * Returns a new Route instance that's a child of this route.
      * @param {string} path Extends this route's path if it doesn't contain a
      *     leading slash.
      * @param {string=} opt_subpageName
      * @return {!settings.Route}
      * @private
      */
     createChild: function(path, opt_subpageName) {
       assert(path);
 
       // |path| extends this route's path if it doesn't have a leading slash.
       // If it does have a leading slash, it's just set as the new route's URL.
       var newUrl = path[0] == '/' ? path : this.path + '/' + path;
 
       var route = new Route(newUrl);
       route.parent = this;
-      route.page = this.page;
       route.section = this.section;
       route.subpage = this.subpage.slice();  // Shallow copy.
 
       if (opt_subpageName)
         route.subpage.push(opt_subpageName);
 
       return route;
     },
 
     /**
@@ skipping 17 matching lines @@
      * @return {!settings.Route}
      * @private
      */
     createSection: function(path, section) {
       var route = this.createChild(path);
       route.section = section;
       return route;
     },
 
     /**
-     * Returns true if this route is a descendant of the parameter.
+     * Returns true if this route matches or is an ancestor of the parameter.
      * @param {!settings.Route} route
      * @return {boolean}
      */
-    isDescendantOf: function(route) {
-      for (var parent = this.parent; parent != null; parent = parent.parent) {
-        if (route == parent)
+    contains: function(route) {
+      if (this == route)

[michaelpg, 2016/07/29 20:28:53]

optional alternative:

    for (; route != null; route = route.parent) {
      if (this == route)
        return true;
    }
    return false;

or with no loop body *evil grin*

    for (; route && route != this; route = route.parent);
    return !!route;

[tommycli, 2016/07/29 21:04:39]

Done.  Though I had to make it a slight variant since .parent can be null but
the route parameter variable can't be.

+        return true;
+
+      for (var parent = route.parent; parent != null; parent = parent.parent) {
+        if (this == parent)
           return true;
       }
 
       return false;
     },
   };
 
   // Abbreviated variable for easier definitions.
   var r = Route;
 
   // Root pages.
   r.BASIC = new Route('/');
-  r.BASIC.page = 'basic';
   r.ADVANCED = new Route('/advanced');
-  r.ADVANCED.page = 'advanced';
   r.ABOUT = new Route('/help');
-  r.ABOUT.page = 'about';
 
 <if expr="chromeos">
   r.INTERNET = r.BASIC.createSection('/internet', 'internet');
   r.NETWORK_DETAIL = r.INTERNET.createChild('/networkDetail', 'network-detail');
   r.KNOWN_NETWORKS = r.INTERNET.createChild('/knownNetworks', 'known-networks');
 </if>
 
   r.APPEARANCE = r.BASIC.createSection('/appearance', 'appearance');
   r.FONTS = r.APPEARANCE.createChild('/fonts', 'appearance-fonts');
 
@@ skipping 148 matching lines @@
   r.DETAILED_BUILD_INFO.section = 'about';
 </if>
 
   /**
    * Use this function (and only this function) to navigate within Settings.
    * This function is set by settings-router once it is created.
    * @type {?function(!settings.Route):void}
    */
   var navigateTo = null;
 
+  /**
+   * Returns the matching canonical route, or null if none matches.
+   * @param {string} path
+   * @return {settings.Route}

[michaelpg, 2016/07/29 20:28:53]

{?s.R}

[tommycli, 2016/07/29 21:04:39]

Done.

+   * @private
+   */
+  var getRouteForPath = function(path) {
+    // TODO(tommycli): Use Object.values once Closure compilation supports it.
+    var matchingKey = Object.keys(Route).find(function(key) {
+      return Route[key].path == path;
+    });
+
+    if (!matchingKey)
+      return null;
+
+    return Route[matchingKey];
+  };
+
   return {
     Route: Route,
     navigateTo: navigateTo,
+    getRouteForPath: getRouteForPath,
   };
 });