| Index: trunk/extensions/TimedMediaHandler/TimedMediaTransformOutput.php |
| — | — | @@ -131,12 +131,11 @@ |
| 132 | 132 | function getXmlMediaTagOutput( $sizeOverride = array() ){ |
| 133 | 133 | // Try to get the first source src attribute ( usually this should be the source file ) |
| 134 | 134 | $mediaSources = $this->getMediaSources(); |
| 135 | | - $firstSource = current( reset( $mediaSources ) ); |
| | 135 | + $firstSource = current( $mediaSources ); |
| 136 | 136 | if( !$firstSource['src'] ){ |
| 137 | 137 | // XXX media handlers don't seem to work with exceptions.. |
| 138 | 138 | return 'Error missing media source'; |
| 139 | 139 | }; |
| 140 | | - |
| 141 | 140 | // Build the video tag output: |
| 142 | 141 | $s = Xml::tags( $this->getTagName(), $this->getMediaAttr( $sizeOverride ), |
| 143 | 142 | |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js |
| — | — | @@ -660,8 +660,8 @@ |
| 661 | 661 | */ |
| 662 | 662 | loadPlayerSize: function( element ) { |
| 663 | 663 | // check for direct element attribute: |
| 664 | | - this.height = element.height ? element.height : $(element).css( 'height' ); |
| 665 | | - this.width = element.width ? element.width : $(element).css( 'width' ); |
| | 664 | + this.height = element.height ? element.height + '' : $(element).css( 'height' ); |
| | 665 | + this.width = element.width ? element.width + '' : $(element).css( 'width' ); |
| 666 | 666 | // Special check for chrome 100% with re-mapping to 32px |
| 667 | 667 | // ( hopefully no one embeds video at 32x32 ) |
| 668 | 668 | if( this.height == '32px' || this.height =='32px' ){ |
| — | — | @@ -693,8 +693,8 @@ |
| 694 | 694 | |
| 695 | 695 | |
| 696 | 696 | // Special case for audio |
| 697 | | - // Firefox sets audio height to "0px" while webkit uses 32px .. force |
| 698 | | - // zero: |
| | 697 | + |
| | 698 | + // Firefox sets audio height to "0px" while webkit uses 32px .. force zero: |
| 699 | 699 | if( this.isAudio() && this.height == '32' ) { |
| 700 | 700 | this.height = 20; |
| 701 | 701 | } |