| Index: branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js |
| — | — | @@ -950,6 +950,7 @@ |
| 951 | 951 | if( time >= caption.start && |
| 952 | 952 | time <= caption.end ) { |
| 953 | 953 | this.prevIndex = i; |
| | 954 | + //mw.log("Start cap time: " + caption.start + ' End time: ' + caption.end ); |
| 954 | 955 | return caption.content; |
| 955 | 956 | } |
| 956 | 957 | } |
| Index: branches/MwEmbedStandAlone/modules/TimedText/TimedText.i18n.php |
| — | — | @@ -54,7 +54,7 @@ |
| 55 | 55 | 'mwe-timedtext-textcat-lin' => 'Linguistic markup', |
| 56 | 56 | 'mwe-timedtext-textcat-cue' => 'Cue points', |
| 57 | 57 | 'mwe-timedtext-language-subtitles-for-clip' => '$1 subtitles for clip: $2', |
| 58 | | - 'mwe-timedtext-language-no-subtitles-for-clip' => 'No $1 subtitles where found for clip: $2', |
| | 58 | + 'mwe-timedtext-language-no-subtitles-for-clip' => 'No $1 subtitles where found for clip: $2' |
| 59 | 59 | ); |
| 60 | 60 | |
| 61 | 61 | /** Message documentation (Message documentation) |
| Index: branches/MwEmbedStandAlone/modules/TimedText/remotes/RemoteMwTimedText.js |
| — | — | @@ -4,11 +4,12 @@ |
| 5 | 5 | * Does some transformations to normal wiki timed Text pages to make them look |
| 6 | 6 | * like the php output that we will eventually want to have |
| 7 | 7 | */ |
| 8 | | -mw.addMessages( { |
| 9 | | - "mwe-language-subtitles-for-clip": "$1 subtitles for clip: $2", |
| 10 | | - "mwe-language-no-subtitles-for-clip": "No $1 subtitles where found for clip: $2" |
| 11 | | -}); |
| 12 | 8 | |
| | 9 | +mw.addMessageKeys( [ |
| | 10 | + "mwe-timedtext-language-subtitles-for-clip", |
| | 11 | + "mwe-timedtext-language-no-subtitles-for-clip" |
| | 12 | +]); |
| | 13 | + |
| 13 | 14 | RemoteMwTimedText = function( options ) { |
| 14 | 15 | return this.init( options ); |
| 15 | 16 | } |
| — | — | @@ -103,9 +104,9 @@ |
| 104 | 105 | player.timedText.setupTextSources( function() { |
| 105 | 106 | |
| 106 | 107 | var source = player.timedText.getSourceByLanguage( _this.langKey ); |
| 107 | | - var pageMsgKey = 'mwe-language-subtitles-for-clip'; |
| | 108 | + var pageMsgKey = 'mwe-timedtext-language-subtitles-for-clip'; |
| 108 | 109 | if( ! source ) { |
| 109 | | - pageMsgKey = "mwe-language-no-subtitles-for-clip" |
| | 110 | + pageMsgKey = "mwe-timedtext-language-no-subtitles-for-clip" |
| 110 | 111 | } |
| 111 | 112 | // Add the page msg to the top |
| 112 | 113 | $j( _this.target ).prepend( |
| Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js |
| — | — | @@ -177,7 +177,7 @@ |
| 178 | 178 | // Don't block on render |
| 179 | 179 | setTimeout( function(){ |
| 180 | 180 | _this.doNextFrame(); |
| 181 | | - }, 0); |
| | 181 | + }, 1); |
| 182 | 182 | } |
| 183 | 183 | }, true /* hide the buffer overlay */ ); |
| 184 | 184 | }, |
| Index: branches/MwEmbedStandAlone/modules/Sequencer/tools/mw.SequencerTools.js |
| — | — | @@ -866,7 +866,7 @@ |
| 867 | 867 | // Return the trimTimeline edit widget |
| 868 | 868 | 'draw': function( _this, target, smilElement ){ |
| 869 | 869 | var smil = _this.sequencer.getSmil(); |
| 870 | | - var sliderScale = 10000000 |
| | 870 | + var sliderScale = 2000 // assume slider is never more than 2000 pixles wide. |
| 871 | 871 | // check if thumbs are supported |
| 872 | 872 | if( _this.sequencer.getSmil().getRefType( smilElement ) == 'video' ){ |
| 873 | 873 | $j(target).append( |