Merge 120006 - [uber page] Fix url handling for uber-page sub-paths.

chrome/browser/resources/uber/uber.js

 // Copyright (c) 2012 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('uber', function() {
 
   /**
    * Options for how web history should be handled.
    **/
   var HISTORY_STATE_OPTION = {
     PUSH: 1,    // Push a new history state.
     REPLACE: 2  // Replace the current history state.
   };
 
   /**
   * We cache a reference to the #navigation frame here to so we don't need to
   * grab it from the DOM on each scroll.
   * @type {Node}
   * @private
   * @static
   */
   var navFrame;
 
   /**
    * Handles page initialization.
    */
   function onLoad(e) {
-    // If the pathname points to a sub-page, we may need to alter the location
-    // of one of the frames.
-    var params = resolvePageInfoFromPath(window.location.pathname);
-    if (params.path) {
-      var iframe = $(params.id).querySelector('iframe');
-      iframe.contentWindow.location.replace(iframe.src + params.path);
-    }
-
     navFrame = $('navigation');
 
     // Select a page based on the page-URL.
-    showPage(params.id, HISTORY_STATE_OPTION.REPLACE);
+    var params = resolvePageInfoFromPath(window.location.pathname);
+    showPage(params.id, HISTORY_STATE_OPTION.REPLACE, params.path);
 
     window.addEventListener('message', handleWindowMessage);
     window.setTimeout(function() {
       document.documentElement.classList.remove('loading');
     }, 0);
   }
 
   /**
    * Find page information from the given path. If the path doesn't point to one
    * of our pages, return default parameters.
@@ skipping 133 matching lines @@
     // Only update the currently displayed title if this is the visible frame.
     if (container == getSelectedIframe())
       document.title = title;
   }
 
   /**
    * Selects a subpage. This is called from uber-frame.
    * @param {String} pageId Should matche an id of one of the iframe containers.
    * @param {integer} historyOption Indicates whether we should push or replace
    *     browser history.
+   * @param {String=} path An optional sub-page path.
    */
-  function showPage(pageId, historyOption) {
+  function showPage(pageId, historyOption, path) {
     var container = $(pageId);
     var lastSelected = document.querySelector('.iframe-container.selected');
     if (lastSelected === container)
       return;
 
     // Lazy load of iframe contents.
     var frame = container.querySelector('iframe');
+    var sourceURL = frame.dataset.url;
     if (!frame.getAttribute('src'))
-      frame.setAttribute('src', frame.dataset.url);
+      frame.src = sourceURL;
+    // If there is a non-empty path, alter the location of the frame.
+    if (path && path.length)
+      frame.contentWindow.location.replace(sourceURL + path);
 
     if (lastSelected)
       lastSelected.classList.remove('selected');
     container.classList.add('selected');
     document.title = container.title;
     $('favicon').href = container.dataset.favicon;
 
     enableScrollEasing();
     adjustToScroll(0);
 
@@ skipping 38 matching lines @@
 
   return {
     onLoad: onLoad,
     onPopHistoryState: onPopHistoryState
   };
 
 });
 
 window.addEventListener('popstate', uber.onPopHistoryState);
 document.addEventListener('DOMContentLoaded', uber.onLoad);