| Index: trunk/extensions/TimedMediaHandler/TranscodeStatusTable.php |
| — | — | @@ -114,7 +114,7 @@ |
| 115 | 115 | $doneMsg = wfMsgHtml('timedmedia-percent-done', round( filesize( $filePath ) / $targetSize, 2 ) ); |
| 116 | 116 | } |
| 117 | 117 | } */ |
| 118 | | - // predicting percent done is not working well right now ( disabled for now ) |
| | 118 | + // Predicting percent done is not working well right now ( disabled for now ) |
| 119 | 119 | $doneMsg = ''; |
| 120 | 120 | return wfMsgHtml('timedmedia-started-transcode', TimedMediaHandler::getTimePassedMsg( $timePassed ), $doneMsg ); |
| 121 | 121 | } |
| Index: trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php |
| — | — | @@ -658,7 +658,6 @@ |
| 659 | 659 | */ |
| 660 | 660 | public static function isTargetLargerThanFile( &$file, $targetMaxSize ){ |
| 661 | 661 | $maxSize = self::getMaxSize( $targetMaxSize ); |
| 662 | | - print_r($max_size); |
| 663 | 662 | $sourceWidth = $file->getWidth(); |
| 664 | 663 | $sourceHeight = $file->getHeight(); |
| 665 | 664 | $sourceAspect = intval( $sourceWidth ) / intval( $sourceHeight ); |
| Index: trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js |
| — | — | @@ -52,12 +52,12 @@ |
| 53 | 53 | * The list of enabled sources |
| 54 | 54 | */ |
| 55 | 55 | enabledSources: null, |
| 56 | | - |
| | 56 | + |
| 57 | 57 | /** |
| 58 | | - * The current langauge key |
| | 58 | + * The current language key |
| 59 | 59 | */ |
| 60 | 60 | currentLangKey : null, |
| 61 | | - |
| | 61 | + |
| 62 | 62 | /** |
| 63 | 63 | * Stores the last text string per category to avoid dom checks |
| 64 | 64 | * for updated text |
| — | — | @@ -150,7 +150,7 @@ |
| 151 | 151 | $( embedPlayer ).bind( 'play', function() { |
| 152 | 152 | // Will load and setup timedText sources (if not loaded already loaded ) |
| 153 | 153 | _this.setupTextSources(); |
| 154 | | - } ); |
| | 154 | + } ); |
| 155 | 155 | |
| 156 | 156 | // Resize the timed text font size per window width |
| 157 | 157 | $( embedPlayer ).bind( 'onCloseFullScreen onOpenFullScreen', function() { |
| — | — | @@ -898,7 +898,7 @@ |
| 899 | 899 | * Updates the timed text layout ( should be called when config.layout changes ) |
| 900 | 900 | */ |
| 901 | 901 | updateLayout: function() { |
| 902 | | - var $playerTarget = this.embedPlayer.$interface; |
| | 902 | + var $playerTarget = this.embedPlayer.$interface; |
| 903 | 903 | $playerTarget.find('.track').remove(); |
| 904 | 904 | this.refreshDisplay(); |
| 905 | 905 | }, |
| — | — | @@ -1427,6 +1427,10 @@ |
| 1428 | 1428 | var content, start, end, s; |
| 1429 | 1429 | caption = caplist[i]; |
| 1430 | 1430 | s = caption.split(/\n/); |
| | 1431 | + if (s.length < 2) { |
| | 1432 | + // file format error or comment lines |
| | 1433 | + continue; |
| | 1434 | + } |
| 1431 | 1435 | if (s[0].match(/^\d+$/) && s[1].match(/\d+:\d+:\d+/)) { |
| 1432 | 1436 | // ignore caption number in s[0] |
| 1433 | 1437 | // parse time string |