| Index: trunk/extensions/OggHandler/OggHandler_body.php |
| — | — | @@ -302,7 +302,7 @@ |
| 303 | 303 | ' ' . wfEscapeShellArg( $file->getPath() ) . ' 2>&1'; |
| 304 | 304 | $returnText = wfShellExec( $cmd, $retval ); |
| 305 | 305 | //check if it was successful or if we should try ffmpeg: |
| 306 | | - if ( ! $this->removeBadFile( $dstPath, $retval ) ) { |
| | 306 | + if ( !$this->removeBadFile( $dstPath, $retval ) ) { |
| 307 | 307 | return true; |
| 308 | 308 | } |
| 309 | 309 | } |
| — | — | @@ -642,7 +642,7 @@ |
| 643 | 643 | $showDescIcon = false; |
| 644 | 644 | |
| 645 | 645 | //check if outputing to video tag or oggHandler |
| 646 | | - if( $wgJs2VideoTagOut && $wgEnableJS2system){ |
| | 646 | + if( $wgJs2VideoTagOut && $wgEnableJS2system ){ |
| 647 | 647 | //video tag output: |
| 648 | 648 | if ( $this->isVideo ) { |
| 649 | 649 | $playerHeight = $height; |
| — | — | @@ -668,12 +668,12 @@ |
| 669 | 669 | 'startOffset' => $offset, |
| 670 | 670 | 'linkback' => $linkAttribs['href'] |
| 671 | 671 | ); |
| 672 | | - |
| 673 | 672 | if( $wgEnableTemporalOggUrls ) |
| 674 | 673 | $videoAttr['URLTimeEncoding'] = 'true'; |
| 675 | 674 | |
| 676 | 675 | $s = Xml::tags( 'video', $videoAttr, |
| 677 | 676 | Xml::tags('div', array( |
| | 677 | + 'class'=>'videonojs', |
| 678 | 678 | 'style'=>"overflow:hidden;". |
| 679 | 679 | "width:{$width}px;height:{$playerHeight}px;". |
| 680 | 680 | "border:solid thin black;padding:5px;" |
| — | — | @@ -687,7 +687,6 @@ |
| 688 | 688 | |
| 689 | 689 | }else{ |
| 690 | 690 | //oggHandler output: |
| 691 | | - |
| 692 | 691 | if ( $this->isVideo ) { |
| 693 | 692 | $msgStartPlayer = wfMsg( 'ogg-play-video' ); |
| 694 | 693 | $imgAttribs = array( |
| — | — | @@ -917,4 +916,4 @@ |
| 918 | 917 | } |
| 919 | 918 | } |
| 920 | 919 | |
| 921 | | -?> |
| | 920 | +?> |
| \ No newline at end of file |