chrome/common/extensions/docs/server2/render_servlet.py - Issue 103413002: Docserver: Include <h4> tags in the table of contents, it's needed for the API

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/server2/render_servlet.py

Issue 103413002: Docserver: Include <h4> tags in the table of contents, it's needed for the API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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 | « chrome/common/extensions/docs/server2/intro_data_source.py ('k') | chrome/common/extensions/docs/server2/server_instance.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/docs/server2/render_servlet.py

diff --git a/chrome/common/extensions/docs/server2/render_servlet.py b/chrome/common/extensions/docs/server2/render_servlet.py

index 4272b2e358e1c174ddd7f253981beed35ec38909..8869a8c582d70870c2e36cbd82dd7899b005fac2 100644

--- a/chrome/common/extensions/docs/server2/render_servlet.py

+++ b/chrome/common/extensions/docs/server2/render_servlet.py

@@ -98,10 +98,13 @@ class RenderServlet(Servlet):

content = content_and_type.content

if isinstance(content, Handlebar):

+ template_content, template_warnings = (

+ server_instance.template_renderer.Render(content, self._request))

# HACK: the Google ID thing (google2ed...) doesn't have a title.

- content, warnings = server_instance.document_renderer.Render(

- server_instance.template_renderer.Render(content, self._request),

+ content, doc_warnings = server_instance.document_renderer.Render(

+ template_content,

render_title=path != 'google2ed1af765c529f57.html')

+ warnings = template_warnings + doc_warnings

if warnings:

sep = '\n - '

logging.warning('Rendering %s:%s%s' % (path, sep, sep.join(warnings)))