changeset 3517:41bfc5d6e3d3

macro.EmbedObject: use default unit px if None is given
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Tue, 22 Apr 2008 15:54:35 +0200
parents a81ad9e5d220
children ef612c82bdfd
files MoinMoin/macro/EmbedObject.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/macro/EmbedObject.py	Tue Apr 22 14:47:26 2008 +0200
+++ b/MoinMoin/macro/EmbedObject.py	Tue Apr 22 15:54:35 2008 +0200
@@ -51,8 +51,8 @@
         return ""
 
 def macro_EmbedObject(macro, target=wikiutil.required_arg(unicode), pagename=None,
-                      width=wikiutil.UnitArgument(None, float, ['px', 'em', 'mm', '%']),
-                      height=wikiutil.UnitArgument(None, float, ['px', 'em', 'mm', '%']),
+                      width=wikiutil.UnitArgument(None, float, ['px', 'em', 'pt', 'in', 'mm', '%'], defaultunit='px'),
+                      height=wikiutil.UnitArgument(None, float, ['px', 'em', 'pt', 'in', 'mm', '%'], defaultunit='px'),
                       alt=u'',
                       play=False, stop=True, loop=False, quality=(u'high', u'low', u'medium'),
                       op=True, repeat=False, autostart=False, align=(u'middle', u'top', u'bottom'), hidden=False,