diff options
| author | Georg Brandl <georg@python.org> | 2010-05-24 11:56:48 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-05-24 11:56:48 +0200 |
| commit | bfc13ad26a4eacd0396942cf4b94bda8bffe2549 (patch) | |
| tree | fbb77e5b442055d23e2b59f0657bc5c63d7a8e1f /sphinx/domains/javascript.py | |
| parent | f2b4c62a84a0b8e4fad7c271506d865d804bfdcc (diff) | |
| parent | 1967a8fdae3b189d8a4fec00121e18732b818c97 (diff) | |
| download | sphinx-bfc13ad26a4eacd0396942cf4b94bda8bffe2549.tar.gz | |
null-merge rev d4fe9e7df03a from http://bitbucket.org/tpowers/sphinx/
Diffstat (limited to 'sphinx/domains/javascript.py')
| -rw-r--r-- | sphinx/domains/javascript.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py index a3a4abec..31a76987 100644 --- a/sphinx/domains/javascript.py +++ b/sphinx/domains/javascript.py @@ -8,7 +8,6 @@ :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ -import re from sphinx import addnodes from sphinx.domains import Domain, ObjType @@ -93,7 +92,7 @@ class JSObject(ObjectDescription): fullname = name_obj[0] if fullname not in self.state.document.ids: signode['names'].append(fullname) - signode['ids'].append(fullname) + signode['ids'].append(fullname.replace('$', '_S_')) signode['first'] = not self.names self.state.document.note_explicit_target(signode) objects = self.env.domaindata['js']['objects'] @@ -164,9 +163,9 @@ class JavaScriptDomain(Domain): label = 'JavaScript' # if you add a new object type make sure to edit JSObject.get_index_string object_types = { - 'function': ObjType(l_('JavaScript function'), 'func'), - 'data': ObjType(l_('JavaScript data'), 'data'), - 'attribute': ObjType(l_('JavaScript attribute'), 'attr'), + 'function': ObjType(l_('function'), 'func'), + 'data': ObjType(l_('data'), 'data'), + 'attribute': ObjType(l_('attribute'), 'attr'), } directives = { 'function': JSCallable, @@ -215,4 +214,4 @@ class JavaScriptDomain(Domain): def get_objects(self): for refname, (docname, type) in self.data['objects'].iteritems(): - yield refname, type, docname, refname, 1 + yield refname, refname, type, docname, refname, 1 |