[FIX] _extension: complete monkeypatch in sphinx 1.6
The monkey patch made for sphinx 1.6 was not complete. In comparison to the one done for previous versions (resolve_toctree), navbarify was not called. In the toctree, the sub-levels were turned into a link in 1.6 while navbarify prevents this.
This commit is contained in:
parent
2ca5c635b9
commit
f7cb30b6d8
@ -111,7 +111,13 @@ if toctree:
|
|||||||
def resolve(old_resolve, tree, docname, *args, **kwargs):
|
def resolve(old_resolve, tree, docname, *args, **kwargs):
|
||||||
if docname == tree.env.config.master_doc:
|
if docname == tree.env.config.master_doc:
|
||||||
return resolve_content_toctree(tree.env, docname, *args, **kwargs)
|
return resolve_content_toctree(tree.env, docname, *args, **kwargs)
|
||||||
return old_resolve(tree, docname, *args, **kwargs)
|
toc = old_resolve(tree, docname, *args, **kwargs)
|
||||||
|
if toc is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
navbarify(toc[0], navbar=kwargs.pop('navbar', None))
|
||||||
|
return toc
|
||||||
|
|
||||||
|
|
||||||
@monkey(sphinx.environment.BuildEnvironment)
|
@monkey(sphinx.environment.BuildEnvironment)
|
||||||
def resolve_toctree(old_resolve, self, docname, *args, **kwargs):
|
def resolve_toctree(old_resolve, self, docname, *args, **kwargs):
|
||||||
|
Loading…
Reference in New Issue
Block a user