Factor out the anchor prefix to easily allow switching to #!

client/web/app.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * This application displays documentation generated by the docgen tool
  * found at dart-repo/dart/pkg/docgen.
  *
  * The Yaml file outputted by the docgen tool will be read in to
  * generate [Page] and [Category] and [CompositeContainer].
@@ skipping 232 matching lines @@
     if (location.subMemberName == null) return location;
     var newLocation = new DocsLocation(location.parentQualifiedName);
     newLocation.anchor = newLocation.toHash(location.subMemberName);
     return newLocation;
   }
 
   /// Replace the window location with [location]
   String _replaceLocation(DocsLocation location) {
     var newUri = location.withAnchor;
     var encoded = Uri.encodeFull(newUri);
-    window.location.replace("#$encoded");
+    window.location.replace(locationPrefixed(encoded));
     return encoded;
   }
 
   /// Loads the [libraryName] [Library] and [className] [Class] if necessary
   /// and updates the current page to the member described by [location]
   /// once the correct member is found and loaded.
   Future _loadAndUpdatePage(DocsLocation location) {
     // If it's loaded, it will be in the index.
     var destination = pageIndex[location.withoutAnchor];
     if (destination == null) {
@@ skipping 74 matching lines @@
 
   /// Looks for the correct [Item] described by [location]. If it is found,
   /// [currentPage] is updated and state is not pushed to the history api.
   /// Returns a [Future] to determine if a link was found or not.
   /// [location] is a [String] path to the location (either a qualified name
   /// or a url path).
   Future handleLink(String uri) {
     // Links are the hash part of the URI without the leading #.
     // Valid forms for links are
     // home - the global home page
-    // library.memberName.subMember#anchor
-    // where #anchor is optional and library can be any of
+    // library.memberName.subMember@anchor
+    // where @anchor is optional and library can be any of
     // dart:library, library-foo, package-foo/library-bar
     // So we need an unambiguous form.
-    // [package/]libraryWithDashes[.class.method]#anchor
+    // [package/]libraryWithDashes[.class.method]@anchor
 
     // We will tolerate colons in the location instead of dashes, though
     var decoded = Uri.decodeFull(uri);
     var location = new DocsLocation(decoded);
 
     if (location.libraryName == 'home') {
       _updatePage(viewer.homePage, location);
       return new Future.value(true);
     }
     showLoadIndicator();
@@ skipping 47 matching lines @@
   /// Hide the indicator that we're loading data.
   hideLoadIndicator() => loadIndicator.style.display = 'none';
 }
 
 /// The path of this app on startup.
 String _pathname;
 
 /// The latest url reached by a popState event.
 String location;
 
+/// The google crawler will try to translate #! anchors into query parameters
+/// with an _escaped_fragment_ in front of them. Assume that's the only query
+/// parameter.
+const _ESCAPED_FRAGMENT = '?_escaped_fragment_=';
+String findLocation() {

[Emily Fortuna, 2014/02/04 01:47:51]

add a comment to this function and add a newline

[Alan Knight, 2014/02/04 18:08:14]

Done.

+  var hash = window.location.hash;
+  var query = window.location.search;
+  if (query.startsWith(_ESCAPED_FRAGMENT)) {
+    return query.substring(_ESCAPED_FRAGMENT.length, query.length);
+  } else {
+    return locationDeprefixed(hash);
+  }
+}
+
 /// Listens for browser navigation and acts accordingly.
 void startHistory() {
-  location = window.location.hash.replaceFirst('#', '');
+  location = findLocation();
   windowLocation.changes.listen(navigate);
 }
 
 void navigate(event) {
   // TODO(alanknight): Should we be URI encoding/decoding this?
-  var newLocation = window.location.hash.replaceFirst('#', '');
+  var newLocation = findLocation();
   if (viewer.homePage != null) {
     viewer.handleLink(newLocation);
   }
 }
 
 /// Handles browser navigation.
 @initMethod _init() {
   window.onResize.listen((event) {
     viewer.isDesktop = window.innerWidth > desktopSizeBoundary;
     dartdocMain.collapseSearchAndOptionsIfNeeded();
@@ skipping 22 matching lines @@
 main() => initPolymer();
 
 
 final defaultSyntax = new _DefaultSyntaxWithEvents();
 
 // TODO(jmesserly): for now we disable polymer expressions
 class _DefaultSyntaxWithEvents extends BindingDelegate {
   prepareBinding(String path, name, node) =>
       Polymer.prepareBinding(path, name, node, super.prepareBinding);
 }