[uber] make the navigation controls an iframe

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() {
 
   /**
    * Handles page initialization.
    */
   function onLoad() {
-    var navigationItems = document.querySelectorAll('#navigation li');
-    var iframes = document.querySelectorAll('.iframe-container');
-
-    for (var i = 0; i < navigationItems.length; ++i) {
-      var navItem = navigationItems[i];
-      navItem.associatedIframe = iframes[i];
-      iframes[i].associatedNavItem = navItem;
-      navItem.addEventListener('click', onNavItemClicked);
-    }
-
     // Update the URL if need be.
     if (window.location.pathname === '/') {
-      var selectedNavItem = document.querySelector('#navigation li.selected');
-      var pageId = selectedNavItem.associatedIframe.id;
+      var pageId = getSelectedIframe().id;
       window.history.replaceState({pageId: pageId}, '', '/' + pageId);
     }
 
     window.addEventListener('message', handleWindowMessage);
   }
 
   /**
-   * Handles clicks on the navigation controls (switches the page and updates
-   * the URL).
-   * @param {Event} e The click event.
-   */
-  function onNavItemClicked(e) {
-    if (selectPageForNavItem(e.currentTarget)) {
-      var pageId = e.currentTarget.associatedIframe.id;
-      window.history.pushState({pageId: pageId}, '', '/' + pageId);
-    }
-  }
-
-  /**
    * Selects the page for |navItem|, or does nothing if that item has already
    * been selected.
    * @param {Object} navItem The navigation control li.
    * @return {boolean} True if the item became selected, false if it had already
    *     been selected.
    */
   function selectPageForNavItem(navItem) {
     // Note that |iframe| is the containing element of the underlying iframe, as
     // opposed to the iframe element itself.
     var iframe = navItem.associatedIframe;
-    var currentIframe = getSelectedIframe_();
+    var currentIframe = getSelectedIframe();
     if (currentIframe == iframe)
       return false;
 
     // Restore the cached title.
     if (iframe.title)
       document.title = iframe.title;
 
+    console.log('removing');

[Dan Beam, 2012/01/20 00:59:02]

remove the removing

[Evan Stade, 2012/01/20 03:27:07]

Done.

     currentIframe.classList.remove('selected');
     iframe.classList.add('selected');
 
     var currentNavItem = document.querySelector('li.selected');
     currentNavItem.classList.remove('selected');
     navItem.classList.add('selected');
 
     return true;
   }
 
   /**
    * Handler for window.onpopstate.
    * @param {Event} e The history event.
    */
   function onPopHistoryState(e) {
     if (e.state && e.state.pageId)
-      selectPageForNavItem($(e.state.pageId).associatedNavItem);
+      showPage(e.state.pageId);
   }
 
   /**
    * @return {Object} The currently selected iframe container.
    * @private

[csilv, 2012/01/20 03:30:11]

The naming change implies that this is no longer private, although its not
referenced outside that I can see.  (uber_frame.js has its own copy of this
function.)

[Evan Stade, 2012/01/20 03:36:07]

good catch, i should remove @private

    */
-  function getSelectedIframe_() {
+  function getSelectedIframe() {
     return document.querySelector('.iframe-container.selected');
   }
 
   /**
    * Handles postMessage calls from the iframes of the contained pages.
    *
    * The pages request functionality from this object by passing an object of
    * the following form:
    *
    *  { method : "methodToInvoke",
    *    params : {...}
    *  }
    *
    * |method| is required, while |params| is optional. Extra parameters required
    * by a method must be specified by that method's documentation.
    *
    * @param {Event} e The posted object.
    */
   function handleWindowMessage(e) {
-    if (e.data.method === 'showOverlay')
-      showOverlay_();
-    else if (e.data.method === 'hideOverlay')
-      hideOverlay_();
+    if (e.data.method === 'beginInterceptingEvents')
+      backgroundNavigation();
+    else if (e.data.method === 'stopInterceptingEvents')
+      foregroundNavigation();
     else if (e.data.method === 'setTitle')
       setTitle_(e.origin, e.data.params);
+    else if (e.data.method === 'showPage')
+      showPage(e.data.params.pageId);
+    else if (e.data.method === 'navigationControlsLoaded')
+      onNavigationControlsLoaded();
     else
       console.error('Received unexpected message: ' + e.data);
   }
 
   /**
    * @private
    */
-  function showOverlay_() {
-    document.querySelector('.overlay').classList.add('showing');
+  function backgroundNavigation() {

[csilv, 2012/01/20 03:30:11]

Why remove the underscores on these two methods?

[Evan Stade, 2012/01/20 03:36:07]

because they are not methods, they are functions

+    $('navigation').classList.add('background');
   }
 
   /**
    * @private
    */
-  function hideOverlay_() {
-    document.querySelector('.overlay').classList.remove('showing');
+  function foregroundNavigation() {
+    $('navigation').classList.remove('background');
   }
 
   /**
    * Sets the title of the page.
    * @param {Object} origin The origin of the source iframe.
    * @param {Object} params Must contain a |title| property.
    * @private
    */
   function setTitle_(origin, params) {
     // |iframe.src| always contains a trailing backslash while |origin| does not
     // so add the trailing source for normalization.
     var query = '.iframe-container > iframe[src="' + origin + '/"]';
 
     // Cache the title for the client iframe, i.e., the iframe setting the
     // title. querySelector returns the actual iframe element, so use parentNode
     // to get back to the container.
     var container = document.querySelector(query).parentNode;
     container.title = params.title;
 
     // Only update the currently displayed title if this is the visible frame.
-    if (container == getSelectedIframe_())
+    if (container == getSelectedIframe())
       document.title = params.title;
   }
 
+  /**
+   * Selects a subpage. This is called from uber-frame.
+   * @param {String} pageId Should matche an id of one of the iframe containers.
+   */
+  function showPage(pageId) {
+    var container = $(pageId);
+    var lastSelected = document.querySelector('.iframe-container.selected');
+    if (lastSelected === container)
+      return;
+
+    console.log('removing');

[Dan Beam, 2012/01/20 00:59:02]

here too

+    lastSelected.classList.remove('selected');
+    container.classList.add('selected');
+    document.title = container.title;
+
+    window.history.pushState({pageId: pageId}, '', '/' + pageId);
+    updateNavigationControls();
+  }
+
+  function onNavigationControlsLoaded() {
+    updateNavigationControls();
+  }
+
+  /**
+   * Sends a message to uber-frame to update the appearance of the nav controls.
+   * It should be called whenever the selected iframe changes.
+   */
+  function updateNavigationControls() {
+    var iframe = getSelectedIframe();
+    uber.invokeMethodOnWindow($('navigation').firstChild.contentWindow,
+                              'changeSelection', {pageId: iframe.id});
+  }
+
   return {
     onLoad: onLoad,
     onPopHistoryState: onPopHistoryState
   };
 
 });
 
 window.addEventListener('popstate', uber.onPopHistoryState);
 document.addEventListener('DOMContentLoaded', uber.onLoad);