http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90623
Revision: 90623
Author: dale
Date: 2011-06-22 22:48:21 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
fixed IE size attributes for player ( can't read style attribute for created
tags like <video> <audio>
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
2011-06-22 22:42:48 UTC (rev 90622)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
2011-06-22 22:48:21 UTC (rev 90623)
@@ -601,6 +601,7 @@
// Set the player size attributes based loaded video element:
this.loadPlayerSize( element );
+
// Set the plugin id
this.pid = 'pid_' + this.id;
@@ -658,8 +659,9 @@
* element Source element to grab size from
*/
loadPlayerSize: function( element ) {
- this.height = $(element).css( 'height' );
- this.width = $(element).css( 'width' );
+ // check for direct element attribute:
+ this.height = element.height ? element.height : $(element).css(
'height' );
+ this.width = element.width ? element.width : $(element).css(
'width' );
// Special check for chrome 100% with re-mapping to 32px
// ( hopefully no one embeds video at 32x32 )
if( this.height == '32px' || this.height =='32px' ){
Modified: trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
2011-06-22 22:42:48 UTC (rev 90622)
+++ trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php
2011-06-22 22:48:21 UTC (rev 90623)
@@ -204,9 +204,12 @@
$posterUrl = $apiUrl;
}
}
- $mediaAttr = array(
+ $mediaAttr = array(
'id' => self::PLAYER_ID_PREFIX .
TimedMediaTransformOutput::$serial++,
'style' => "width:{$width}px;height:{$height}px",
+ // also set direct width height attributes for IE html
elements to retain properties:
+ 'width' => $width,
+ 'height' => $height,
// Get the correct size:
'poster' => $posterUrl,
'alt' => $this->file->getTitle()->getText(),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
