[Checkins] SVN: z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/j keep silent when nothing to render
Adam Groszer
agroszer at gmail.com
Fri Nov 14 10:59:56 EST 2008
Log message for revision 92929:
keep silent when nothing to render
Changed:
U z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jqueryrenderer.py
U z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsclientevent.py
U z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsevent.py
U z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsfunction.py
-=-
Modified: z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jqueryrenderer.py
===================================================================
--- z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jqueryrenderer.py 2008-11-14 15:39:22 UTC (rev 92928)
+++ z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jqueryrenderer.py 2008-11-14 15:59:55 UTC (rev 92929)
@@ -113,8 +113,12 @@
self.renderers.append(renderer)
def render(self):
- return '$(document).ready(function(){\n %s\n})' %(
- '\n '.join([r.render() for r in self.renderers]) )
+ parts = [r.render() for r in self.renderers]
+ if parts:
+ return '$(document).ready(function(){\n %s\n})' %(
+ '\n '.join(parts) )
+ else:
+ return ''
class JQueryObjectEventRenderer(object):
zope.component.adapts(IObjectEvent,
Modified: z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsclientevent.py
===================================================================
--- z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsclientevent.py 2008-11-14 15:39:22 UTC (rev 92928)
+++ z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsclientevent.py 2008-11-14 15:59:55 UTC (rev 92929)
@@ -184,4 +184,7 @@
def render(self):
content = self.__parent__.eventInjections
- return u'<script type="text/javascript">\n%s\n</script>' % content
+ if content:
+ return u'<script type="text/javascript">\n%s\n</script>' % content
+ else:
+ return u''
Modified: z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsevent.py
===================================================================
--- z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsevent.py 2008-11-14 15:39:22 UTC (rev 92928)
+++ z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsevent.py 2008-11-14 15:59:55 UTC (rev 92929)
@@ -146,4 +146,7 @@
def render(self):
content = self.renderer.render()
- return u'<script type="text/javascript">\n%s\n</script>' % content
+ if content:
+ return u'<script type="text/javascript">\n%s\n</script>' % content
+ else:
+ return u''
Modified: z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsfunction.py
===================================================================
--- z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsfunction.py 2008-11-14 15:39:22 UTC (rev 92928)
+++ z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsfunction.py 2008-11-14 15:59:55 UTC (rev 92929)
@@ -142,4 +142,7 @@
def render(self):
content = self.__parent__.jsFunctions.render()
- return u'<script type="text/javascript">\n%s\n</script>' % content
+ if content:
+ return u'<script type="text/javascript">\n%s\n</script>' % content
+ else:
+ return u''
More information about the Checkins
mailing list