diff --git a/src/plugins/multimedia/multimedia.js b/src/plugins/multimedia/multimedia.js
index f4687279206..fce82287c41 100644
--- a/src/plugins/multimedia/multimedia.js
+++ b/src/plugins/multimedia/multimedia.js
@@ -473,8 +473,8 @@ $document.on( initializedEvent, selector, function() {
id = $this.attr( "id" ) !== undef ? $this.attr( "id" ) : "wb-mm-" + ( seed++ ),
mId = $media.attr( "id" ) !== undef ? $media.attr( "id" ) : "" + id + "-md",
type = $media.is( "video" ) ? "video" : "audio",
- width = type === "video" ? $media.attr( "width" ) : "0",
- height = type === "video" ? $media.attr( "height" ) : "0",
+ width = type === "video" ? $media.attr( "width" ) ? $media.attr( "width" ) : $media.width() : "0",
+ height = type === "video" ? $media.attr( "height" ) ? $media.attr( "height" ) : $media.height() : "0",
data = $.extend({
media: $media,
captions: $captions,
@@ -531,29 +531,30 @@ $document.on( fallbackEvent, selector, function() {
$this = ref[ 0 ],
$data = ref[ 1 ],
$media = $data.media,
- $poster = $media.attr( "poster" ),
$source = $data.media.find( "source" ),
- $playerresource;
+ poster = $media.attr( "poster" ),
+ flashvars = "id=" + $data.mId,
+ playerresource = wb.getPath( "/assets" ) + "/multimedia.swf?" + flashvars;
- $data.flashvars = "id=" + $data.mId;
- $playerresource = wb.getPath( "/assets" ) + "/multimedia.swf?" + $data.flashvars;
$data.poster = "";
if ( $data.type === "video" ) {
- $data.poster = "";
- $data.flashvars += "&height=" + $media.height() + "&width=" +
- $media.width() + "&posterimg=" +
- encodeURI( wb.getUrlParts( $poster ).absolute ) + "&media=" +
+
+ flashvars += "&height=" + $data.height + "&width=" +
+ $data.width + "&posterimg=" +
+ encodeURI( wb.getUrlParts( poster ).absolute ) + "&media=" +
encodeURI( wb.getUrlParts( $source.filter( "[type='video/mp4']" ).attr( "src" ) ).absolute );
} else {
- $data.flashvars += "&media=" + encodeURI( wb.getUrlParts( $source.filter( "[type='audio/mp3']" ).attr( "src" ) ).absolute );
+ flashvars += "&media=" + encodeURI( wb.getUrlParts( $source.filter( "[type='audio/mp3']" ).attr( "src" ) ).absolute );
}
+
$this.find( "video, audio" ).replaceWith( "