Merge pull request #1127 from dart-lang/url-search

Add support for URL-based searches.

Author: nex3

CHANGELOG.md

@@ -72,7 +72,7 @@ function initSearch() {
     'constructor' : 4
   };
 
-  function findMatches(q, cb) {
+  function findMatches(q) {
     var allMatches = []; // list of matches
 
     function score(element, num) {
@@ -137,10 +137,19 @@ function initSearch() {
       sortedMatches.push(allMatches[i].e);
     }
 
-    cb(sortedMatches);
+    return sortedMatches;
   };
 
   function initTypeahead() {
+    var search = new URI().query(true)["search"];
+    if (search) {
+      var matches = findMatches(search);
+      if (matches.length != 0) {
+        window.location = matches[0].href;
+        return;
+      }
+    }
+
     $('#search-box').prop('disabled', false);
     $('#search-box').prop('placeholder', 'Search');
     $(document).keypress(function(event) {
@@ -158,7 +167,7 @@ function initSearch() {
     {
       name: 'elements',
       limit: 10,
-      source: findMatches,
+      source: function(q, cb) { cb(findMatches(q)); },
       display: function(element) { return element.name; },
       templates: {
         suggestion: function(match) {

lib/resources/URI.js

@@ -3,6 +3,7 @@
 library dartdoc.html.resources;
 
 const List<String> resource_names = const [
+  'package:dartdoc/resources/URI.js',
   'package:dartdoc/resources/css/bootstrap.css',
   'package:dartdoc/resources/css/bootstrap.css.map',
   'package:dartdoc/resources/css/bootstrap.min.css',

lib/resources/script.js

@@ -26,6 +26,7 @@
 <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
 <script src="static-assets/typeahead.bundle.min.js"></script>
 <script src="static-assets/prettify.js"></script>
+<script src="static-assets/URI.js"></script>
 <script src="static-assets/script.js"></script>
 <!-- Do not remove placeholder -->
 <!-- Footer Placeholder -->

lib/src/html/resources.g.dart

@@ -1,6 +1,6 @@
 name: dartdoc
 # Also update the `version` field in lib/dartdoc.dart.
-version: 0.9.2
+version: 0.9.3-dev
 author: Dart Team <[email protected]>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc

lib/templates/_footer.html

@@ -150,6 +150,7 @@ <h5>anonymous_library</h5>
 <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
 <script src="static-assets/typeahead.bundle.min.js"></script>
 <script src="static-assets/prettify.js"></script>
+<script src="static-assets/URI.js"></script>
 <script src="static-assets/script.js"></script>
 <!-- Do not remove placeholder -->
 <!-- Footer Placeholder -->

pubspec.yaml

@@ -119,6 +119,7 @@ <h5><a href="anonymous_library/anonymous_library-library.html">anonymous_library
 <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
 <script src="static-assets/typeahead.bundle.min.js"></script>
 <script src="static-assets/prettify.js"></script>
+<script src="static-assets/URI.js"></script>
 <script src="static-assets/script.js"></script>
 <!-- Do not remove placeholder -->
 <!-- Footer Placeholder -->

test_package_docs/anonymous_library/anonymous_library-library.html

@@ -150,6 +150,7 @@ <h5>another_anonymous_lib</h5>
 <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
 <script src="static-assets/typeahead.bundle.min.js"></script>
 <script src="static-assets/prettify.js"></script>
+<script src="static-assets/URI.js"></script>
 <script src="static-assets/script.js"></script>
 <!-- Do not remove placeholder -->
 <!-- Footer Placeholder -->

test_package_docs/anonymous_library/doesStuff.html

@@ -119,6 +119,7 @@ <h5><a href="another_anonymous_lib/another_anonymous_lib-library.html">another_a
 <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
 <script src="static-assets/typeahead.bundle.min.js"></script>
 <script src="static-assets/prettify.js"></script>
+<script src="static-assets/URI.js"></script>
 <script src="static-assets/script.js"></script>
 <!-- Do not remove placeholder -->
 <!-- Footer Placeholder -->