chrome/common/extensions/docs/build/generator.html - Issue 10642015: Basic setup for generating app docs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/docs/build/generator.html

Issue 10642015: Basic setup for generating app docs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 8 years, 6 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

« chrome/common/extensions/docs/build/build.py ('K') | « chrome/common/extensions/docs/build/build.py ('k') | chrome/common/extensions/docs/contentSecurityPolicy.html » ('j') | chrome/common/extensions/docs/js/api_page_generator.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/docs/build/generator.html

diff --git a/chrome/common/extensions/docs/build/generator.html b/chrome/common/extensions/docs/build/generator.html

index 0700d49f5aadde45e18894921cd17f3ba1f7f1d7..d5f09bf5e88be11756b42654b0161020631a7c70 100644

--- a/chrome/common/extensions/docs/build/generator.html

+++ b/chrome/common/extensions/docs/build/generator.html

@@ -2,20 +2,22 @@

<head>

var childFrame;

+var family;

var pages;

var currentPage;

var result = {};

function init() {

- if (!window.layoutTestController) {

- alert("window.layoutTestController not defined.");

- return;

+ if (window.layoutTestController) {

+ layoutTestController.dumpAsText();

+ layoutTestController.waitUntilDone();

+ } else {

+ console.error("No layout test controller");

}

- layoutTestController.dumpAsText();

- layoutTestController.waitUntilDone();

- pages = window.location.search.substring(1).split(",");

+ var queryString = window.location.search.substring(1).split("|");

+ family = queryString[0];

+ pages = queryString[1].split(",");

if (!pages.length) {

alert("please specify which pages to generate via " +

"?<page> ... ie. generator.html?tabs,bookmarks,cookies,...");

@@ -30,7 +32,7 @@ function init() {

function next() {

currentPage = pages.shift();

- childFrame.src = "../" + currentPage + ".html?regenerate";

+ childFrame.src = "../" + family + "/" + currentPage + ".html?regenerate";

}

var count = 0;

@@ -45,7 +47,8 @@ function done() {

"#BEGIN" + JSON.stringify(result) + "#END");

preNode.appendChild(textNode);

document.getElementsByTagName("body")[0].appendChild(preNode);

- layoutTestController.notifyDone();

+ if (window.layoutTestController)

+ layoutTestController.notifyDone();

}

</script>