http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95687
Revision: 95687
Author: dale
Date: 2011-08-29 19:11:20 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
fixed typo
removed debug line
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
trunk/extensions/TimedMediaHandler/TranscodeStatusTable.php
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
2011-08-29 19:05:43 UTC (rev 95686)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
2011-08-29 19:11:20 UTC (rev 95687)
@@ -52,12 +52,12 @@
* The list of enabled sources
*/
enabledSources: null,
-
+
/**
- * The current langauge key
+ * The current language key
*/
currentLangKey : null,
-
+
/**
* Stores the last text string per category to avoid dom checks
* for updated text
@@ -150,7 +150,7 @@
$( embedPlayer ).bind( 'play', function() {
// Will load and setup timedText sources (if
not loaded already loaded )
_this.setupTextSources();
- } );
+ } );
// Resize the timed text font size per window width
$( embedPlayer ).bind( 'onCloseFullScreen
onOpenFullScreen', function() {
@@ -898,7 +898,7 @@
* Updates the timed text layout ( should be called when
config.layout changes )
*/
updateLayout: function() {
- var $playerTarget = this.embedPlayer.$interface;
+ var $playerTarget = this.embedPlayer.$interface;
$playerTarget.find('.track').remove();
this.refreshDisplay();
},
@@ -1427,6 +1427,10 @@
var content, start, end, s;
caption = caplist[i];
s = caption.split(/\n/);
+ if (s.length < 2) {
+ // file format error or comment lines
+ continue;
+ }
if (s[0].match(/^\d+$/) && s[1].match(/\d+:\d+:\d+/)) {
// ignore caption number in s[0]
// parse time string
Modified: trunk/extensions/TimedMediaHandler/TranscodeStatusTable.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TranscodeStatusTable.php 2011-08-29
19:05:43 UTC (rev 95686)
+++ trunk/extensions/TimedMediaHandler/TranscodeStatusTable.php 2011-08-29
19:11:20 UTC (rev 95687)
@@ -114,7 +114,7 @@
$doneMsg =
wfMsgHtml('timedmedia-percent-done', round( filesize( $filePath ) /
$targetSize, 2 ) );
}
} */
- // predicting percent done is not working well right
now ( disabled for now )
+ // Predicting percent done is not working well right
now ( disabled for now )
$doneMsg = '';
return wfMsgHtml('timedmedia-started-transcode',
TimedMediaHandler::getTimePassedMsg( $timePassed ), $doneMsg );
}
Modified:
trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
===================================================================
--- trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
2011-08-29 19:05:43 UTC (rev 95686)
+++ trunk/extensions/TimedMediaHandler/WebVideoTranscode/WebVideoTranscode.php
2011-08-29 19:11:20 UTC (rev 95687)
@@ -658,7 +658,6 @@
*/
public static function isTargetLargerThanFile( &$file, $targetMaxSize ){
$maxSize = self::getMaxSize( $targetMaxSize );
- print_r($max_size);
$sourceWidth = $file->getWidth();
$sourceHeight = $file->getHeight();
$sourceAspect = intval( $sourceWidth ) / intval( $sourceHeight
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
