summaryrefslogtreecommitdiff
path: root/sphinx/domains/javascript.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-01-15 15:47:36 +0100
committerGeorg Brandl <georg@python.org>2011-01-15 15:47:36 +0100
commitbb7bf21c7e47b6582b7f74c3d7b97cd684cfe796 (patch)
tree7f285db7ffd46e4eb2c15741a4a725200b7f61a4 /sphinx/domains/javascript.py
parenta63230f12d1f5af6de24a59ba12c17cc8943cdcd (diff)
parente7fa3c6f45f9917d0a3ded691ef01e1da36ce20b (diff)
downloadsphinx-git-bb7bf21c7e47b6582b7f74c3d7b97cd684cfe796.tar.gz
merge with 1.0
Diffstat (limited to 'sphinx/domains/javascript.py')
-rw-r--r--sphinx/domains/javascript.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py
index 57cee8f9c..73edf4515 100644
--- a/sphinx/domains/javascript.py
+++ b/sphinx/domains/javascript.py
@@ -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.replace('$', '_S_'),
+ ''))
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