changeset 1982:ecae6138ee1b

merged main
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Mon, 09 Apr 2007 07:38:09 +0000
parents 6c58db46c2ed (diff) 19f7c33f6530 (current diff)
children c563b49b8b03 3475126f78c6
files
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/macro/EmbedObject.py	Mon Apr 09 09:24:34 2007 +0200
+++ b/MoinMoin/macro/EmbedObject.py	Mon Apr 09 07:38:09 2007 +0000
@@ -166,7 +166,7 @@
             self.target = args[0]
 
 
-    def embed(self, mt, file):
+    def embed(self, mt, url):
         _ = self._
 
         if not mt:
@@ -187,14 +187,14 @@
         if mt.major == 'video':
             return '''
 <OBJECT>
-<EMBED SRC="%(file)s" WIDTH="%(width)s" HEIGHT="%(height)s" REPEAT="%(repeat)s" AUTOSTART="%(autostart)s" OP="%(op)s" MENU="%(menu)s" TYPE="%(type)s"></EMBED>
+<EMBED SRC="%(url)s" WIDTH="%(width)s" HEIGHT="%(height)s" REPEAT="%(repeat)s" AUTOSTART="%(autostart)s" OP="%(op)s" MENU="%(menu)s" TYPE="%(type)s"></EMBED>
 <NOEMBED>
 <p>%(alt)s</p>
 </NOEMBED>
 </OBJECT>''' % {
     "width": self.width,
     "height": self.height,
-    "file": file,
+    "url": url,
     "repeat": self.repeat,
     "autostart": self.autostart,
     "op": self.op,
@@ -206,14 +206,14 @@
         if mt.major in ['image', 'chemical', 'x-world']:
             return '''
 <OBJECT>
-<EMBED SRC="%(file)s" WIDTH="%(width)s" HEIGHT="%(height)s" TYPE="%(type)s"></EMBED>
+<EMBED SRC="%(url)s" WIDTH="%(width)s" HEIGHT="%(height)s" TYPE="%(type)s"></EMBED>
 <NOEMBED>
 <p>%(alt)s</p>
 </NOEMBED>
 </OBJECT>''' % {
     "width": self.width,
     "height": self.height,
-    "file": file,
+    "url": url,
     "type": mime_type,
     "alt": self.alt,
 }
@@ -221,14 +221,14 @@
         if mt.major == 'audio':
             return '''
 <OBJECT>
-<EMBED SRC="%(file)s" WIDTH="%(width)s" HEIGHT="%(height)s" REPEAT="%(repeat)s" AUTOSTART="%(autostart)s" OP="%(op)s" PLAY="%(play)s" HIDDEN="%(hidden)s" TYPE="%(type)s"></EMBED>
+<EMBED SRC="%(url)s" WIDTH="%(width)s" HEIGHT="%(height)s" REPEAT="%(repeat)s" AUTOSTART="%(autostart)s" OP="%(op)s" PLAY="%(play)s" HIDDEN="%(hidden)s" TYPE="%(type)s"></EMBED>
 <NOEMBED>
 <p>%(alt)s</p>
 </NOEMBED>
 </OBJECT>''' % {
     "width": self.width or "60",
     "height": self.height or "20",
-    "file": file,
+    "url": url,
     "play": self.play,
     "repeat": self.repeat,
     "autostart": self.autostart,
@@ -241,14 +241,14 @@
         if mt.major == 'application':
             return '''
 <OBJECT>
-<EMBED SRC="%(file)s" WIDTH="%(width)s" HEIGHT="%(height)s" AUTOSTART="%(autostart)s" PLAY="%(play)s" LOOP="%(loop)s" MENU="%(menu)s" TYPE="%(type)s"> </EMBED>
+<EMBED SRC="%(url)s" WIDTH="%(width)s" HEIGHT="%(height)s" AUTOSTART="%(autostart)s" PLAY="%(play)s" LOOP="%(loop)s" MENU="%(menu)s" TYPE="%(type)s"> </EMBED>
 <NOEMBED>
 <p>%(alt)s</p>
 </NOEMBED>
 </OBJECT>''' % {
     "width": self.width,
     "height": self.height,
-    "file": file,
+    "url": url,
     "autostart": self.autostart,
     "play": self.play,
     "loop": self.loop,