summaryrefslogtreecommitdiff
path: root/sphinx/domains/javascript.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-09-22 14:51:47 +0200
committerGeorg Brandl <georg@python.org>2014-09-22 14:51:47 +0200
commiteacb5d9cb3b68b21255fd8ebd5e3c357e631f412 (patch)
tree1b259d36d3f105e8b0971acb1f838f89110595e1 /sphinx/domains/javascript.py
parent13ea213d7cfabc741dadd26f94b9645d3ea14b4e (diff)
downloadsphinx-eacb5d9cb3b68b21255fd8ebd5e3c357e631f412.tar.gz
[WIP] parallel read
Diffstat (limited to 'sphinx/domains/javascript.py')
-rw-r--r--sphinx/domains/javascript.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py
index 1169036c..af215fd6 100644
--- a/sphinx/domains/javascript.py
+++ b/sphinx/domains/javascript.py
@@ -187,6 +187,12 @@ class JavaScriptDomain(Domain):
if fn == docname:
del self.data['objects'][fullname]
+ def merge_domaindata(self, docnames, otherdata):
+ # XXX check duplicates
+ for fullname, (fn, objtype) in otherdata['objects'].items():
+ if fn in docnames:
+ self.data['objects'][fullname] = (fn, objtype)
+
def find_obj(self, env, obj, name, typ, searchorder=0):
if name[-2:] == '()':
name = name[:-2]