Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(722)

Unified Diff: utils/apidoc/apidoc.dart

Issue 10829361: 'Find-as-you-type'-search in dartdoc/apidoc. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Rebased Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/utils/dartdoc_search_test.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: utils/apidoc/apidoc.dart
diff --git a/utils/apidoc/apidoc.dart b/utils/apidoc/apidoc.dart
index cfeaa2f2af3e45745722d64edc6c6456699edfa7..1afc8b056099b05f30de2cb00a82422ec326e3bc 100644
--- a/utils/apidoc/apidoc.dart
+++ b/utils/apidoc/apidoc.dart
@@ -62,16 +62,6 @@ void main() {
doc.cleanOutputDirectory(outputDir);
- // Compile the client-side code to JS.
- // TODO(bob): Right path.
-
- final clientScript = (mode == doc.MODE_STATIC) ?
- 'static' : 'live-nav';
- final Future compiled = doc.compileScript(
- doc.scriptDir.append('../../pkg/dartdoc/client-$clientScript.dart'),
- outputDir.append('client-$clientScript.js'));
-
- // TODO(rnystrom): Use platform-specific path separator.
// The basic dartdoc-provided static content.
final Future copiedStatic = doc.copyDirectory(
doc.scriptDir.append('../../pkg/dartdoc/static'),
@@ -129,12 +119,22 @@ void main() {
lister.onDone = (success) {
print('Generating docs...');
final apidoc = new Apidoc(mdn, htmldoc, outputDir, mode, generateAppCache);
+ apidoc.dartdocPath = doc.scriptDir.append('../../pkg/dartdoc/');
// Select the libraries to include in the produced documentation:
apidoc.includeApi = true;
apidoc.includedLibraries = includedLibraries;
- Futures.wait([compiled, copiedStatic, copiedApiDocStatic]).then((_) {
+ Futures.wait([copiedStatic, copiedApiDocStatic]).then((_) {
apidoc.documentLibraries(apidocLibraries, doc.libPath);
+
+ final clientScript = (mode == doc.MODE_STATIC) ? 'static' : 'live-nav';
+ final Future compiled = doc.compileScript(
+ apidoc.dartdocPath.append('client-$clientScript.dart'),
+ outputDir.append('client-$clientScript.js'));
+
+ Futures.wait([compiled, copiedStatic, copiedApiDocStatic]).then((_) {
+ apidoc.cleanup();
+ });
});
};
}
@@ -341,11 +341,11 @@ class Apidoc extends doc.Dartdoc {
super.docIndexLibrary(library);
}
- void docLibraryNavigationJson(LibraryMirror library, Map libraryMap) {
+ void docLibraryNavigationJson(LibraryMirror library, List libraryList) {
// TODO(rnystrom): Hackish. The IO libraries reference this but we don't
// want it in the docs.
if (library.simpleName == 'dart:nativewrappers') return;
- super.docLibraryNavigationJson(library, libraryMap);
+ super.docLibraryNavigationJson(library, libraryList);
}
void docLibrary(LibraryMirror library) {
« no previous file with comments | « tests/utils/dartdoc_search_test.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698