Consistently replace $ by _S_ in JS domain.

This commit is contained in:
Georg Brandl 2011-01-15 14:27:13 +01:00
parent 8df6b58527
commit c41c6227de
2 changed files with 8 additions and 3 deletions

View File

@ -48,6 +48,8 @@ Release 1.0.7 (in development)
* Fix tracebacks occurring for duplicate C++ domain objects.
* Fix JavaScript domain links to objects with ``$`` in their name.
Release 1.0.6 (Jan 04, 2011)
============================

View File

@ -96,7 +96,8 @@ class JSObject(ObjectDescription):
indextext = self.get_index_text(objectname, name_obj)
if indextext:
self.indexnode['entries'].append(('single', indextext,
fullname, fullname))
fullname.replace('$', '_S_'),
fullname))
def get_index_text(self, objectname, name_obj):
name, obj = name_obj
@ -208,8 +209,10 @@ class JavaScriptDomain(Domain):
name, obj = self.find_obj(env, objectname, target, typ, searchorder)
if not obj:
return None
return make_refnode(builder, fromdocname, obj[0], name, contnode, name)
return make_refnode(builder, fromdocname, obj[0],
name.replace('$', '_S_'), contnode, name)
def get_objects(self):
for refname, (docname, type) in self.data['objects'].iteritems():
yield refname, refname, type, docname, refname, 1
yield refname, refname, type, docname, \
refname.replace('$', '_S_'), 1