http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73608
Revision: 73608
Author: dale
Date: 2010-09-23 17:21:55 +0000 (Thu, 23 Sep 2010)
Log Message:
-----------
fixed the localised text for timedText remote
set slider scale to more reasonable size per max resolution
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
branches/MwEmbedStandAlone/modules/Sequencer/tools/mw.SequencerTools.js
branches/MwEmbedStandAlone/modules/TimedText/TimedText.i18n.php
branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
branches/MwEmbedStandAlone/modules/TimedText/remotes/RemoteMwTimedText.js
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
2010-09-23 17:12:43 UTC (rev 73607)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
2010-09-23 17:21:55 UTC (rev 73608)
@@ -177,7 +177,7 @@
// Don't block on render
setTimeout( function(){
_this.doNextFrame();
- }, 0);
+ }, 1);
}
}, true /* hide the buffer overlay */ );
},
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/tools/mw.SequencerTools.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/tools/mw.SequencerTools.js
2010-09-23 17:12:43 UTC (rev 73607)
+++ branches/MwEmbedStandAlone/modules/Sequencer/tools/mw.SequencerTools.js
2010-09-23 17:21:55 UTC (rev 73608)
@@ -866,7 +866,7 @@
// Return the trimTimeline edit widget
'draw': function( _this, target, smilElement ){
var smil = _this.sequencer.getSmil();
- var sliderScale = 10000000
+ var sliderScale = 2000 // assume slider is
never more than 2000 pixles wide.
// check if thumbs are supported
if( _this.sequencer.getSmil().getRefType(
smilElement ) == 'video' ){
$j(target).append(
Modified: branches/MwEmbedStandAlone/modules/TimedText/TimedText.i18n.php
===================================================================
--- branches/MwEmbedStandAlone/modules/TimedText/TimedText.i18n.php
2010-09-23 17:12:43 UTC (rev 73607)
+++ branches/MwEmbedStandAlone/modules/TimedText/TimedText.i18n.php
2010-09-23 17:21:55 UTC (rev 73608)
@@ -54,7 +54,7 @@
'mwe-timedtext-textcat-lin' => 'Linguistic markup',
'mwe-timedtext-textcat-cue' => 'Cue points',
'mwe-timedtext-language-subtitles-for-clip' => '$1 subtitles for clip:
$2',
- 'mwe-timedtext-language-no-subtitles-for-clip' => 'No $1 subtitles
where found for clip: $2',
+ 'mwe-timedtext-language-no-subtitles-for-clip' => 'No $1 subtitles
where found for clip: $2'
);
/** Message documentation (Message documentation)
Modified: branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
===================================================================
--- branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
2010-09-23 17:12:43 UTC (rev 73607)
+++ branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
2010-09-23 17:21:55 UTC (rev 73608)
@@ -950,6 +950,7 @@
if( time >= caption.start &&
time <= caption.end ) {
this.prevIndex = i;
+ //mw.log("Start cap time: " +
caption.start + ' End time: ' + caption.end );
return caption.content;
}
}
Modified:
branches/MwEmbedStandAlone/modules/TimedText/remotes/RemoteMwTimedText.js
===================================================================
--- branches/MwEmbedStandAlone/modules/TimedText/remotes/RemoteMwTimedText.js
2010-09-23 17:12:43 UTC (rev 73607)
+++ branches/MwEmbedStandAlone/modules/TimedText/remotes/RemoteMwTimedText.js
2010-09-23 17:21:55 UTC (rev 73608)
@@ -4,11 +4,12 @@
* Does some transformations to normal wiki timed Text pages to make them look
* like the php output that we will eventually want to have
*/
-mw.addMessages( {
- "mwe-language-subtitles-for-clip": "$1 subtitles for clip: $2",
- "mwe-language-no-subtitles-for-clip": "No $1 subtitles where found for
clip: $2"
-});
+mw.addMessageKeys( [
+ "mwe-timedtext-language-subtitles-for-clip",
+ "mwe-timedtext-language-no-subtitles-for-clip"
+]);
+
RemoteMwTimedText = function( options ) {
return this.init( options );
}
@@ -103,9 +104,9 @@
player.timedText.setupTextSources( function() {
var source =
player.timedText.getSourceByLanguage( _this.langKey );
- var pageMsgKey =
'mwe-language-subtitles-for-clip';
+ var pageMsgKey =
'mwe-timedtext-language-subtitles-for-clip';
if( ! source ) {
- pageMsgKey =
"mwe-language-no-subtitles-for-clip"
+ pageMsgKey =
"mwe-timedtext-language-no-subtitles-for-clip"
}
// Add the page msg to the top
$j( _this.target ).prepend(
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
