github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-26 23:39:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix tabbing issue. update space compression in api to stop extraneous space removal.

Browse Source
This commit is contained in:
Christopher Slowe
2009-07-06 22:06:21 -07:00
parent deeb9eb5bf
commit 427c1ca74c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
r2/r2/lib/jsontemplates.py
View File

@@ -50,13 +50,13 @@ class ObjectTemplate(StringTemplate):
def update(self, kw):
def _update(obj):
if isinstance(obj, (str, unicode)):
return spaceCompress(StringTemplate(obj).finalize(kw))
return StringTemplate(obj).finalize(kw)
elif isinstance(obj, dict):
return dict((k, _update(v)) for k, v in obj.iteritems())
elif isinstance(obj, (list, tuple)):
return map(_update, obj)
elif isinstance(obj, CacheStub) and kw.has_key(obj.name):
return kw[obj.name]
return spaceCompress(kw[obj.name])
else:
return obj
res = _update(self.d)
@@ -238,7 +238,7 @@ class CommentJsonTemplate(ThingJsonTemplate):
except AttributeError:
return make_fullname(Link, thing.link_id)
elif attr == "body_html":
return safemarkdown(thing.body)
return spaceCompress(safemarkdown(thing.body))
return ThingJsonTemplate.thing_attr(self, thing, attr)
def kind(self, wrapped):
@@ -326,8 +326,6 @@ class ListingJsonTemplate(ThingJsonTemplate):
for a in thing.things:
a.childlisting = False
r = a.render()
if isinstance(r, str):
r = spaceCompress(r)
res.append(r)
return res
return ThingJsonTemplate.thing_attr(self, thing, attr)

2
r2/r2/templates/printablebuttons.html
View File

@@ -228,7 +228,7 @@
css_class, alt_css_class = alt_css_class, css_class
%>
<span class="${class_name} toggle" style="${style}">
<a class="option active ${css_class}" href="#"
<a class="option active ${css_class}" href="#" tabindex="100"
%if login_required and not c.user_is_loggedin:
onclick="return showcover('', '${callback}_' + $(this).thing_id());"
%else: