From: Michael Dale Date: Sun, 8 Nov 2009 11:12:00 +0000 (+0000) Subject: * some subtitles fixes X-Git-Tag: 1.31.0-rc.0~38893 X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=04351d3414d964bc4116f942873757cd1105a75f;p=lhc%2Fweb%2Fwiklou.git * some subtitles fixes * onClipDone thumb display --- diff --git a/js2/mwEmbed/libEmbedVideo/embedVideo.js b/js2/mwEmbed/libEmbedVideo/embedVideo.js index 1b119a190d..12fdf90716 100644 --- a/js2/mwEmbed/libEmbedVideo/embedVideo.js +++ b/js2/mwEmbed/libEmbedVideo/embedVideo.js @@ -1134,9 +1134,11 @@ embedVideo.prototype = { for(var pageid in data.query.pages){ if(data.query.pages[pageid].title) req_categories.push(data.query.pages[pageid].title); - } + } + _this.getRelatedFromCat( req_categories ); + }else{ + _this.doThumbnailHTML(); } - _this.getRelatedFromCat( req_categories ); }); }, getRelatedFromCat:function(catAry){ @@ -1225,42 +1227,45 @@ embedVideo.prototype = { $j('#img_thumb_' + this.id).fadeOut("fast"); $j('#dc_'+ _this.id + ' .related_vids ul').html( gM('mwe-loading_txt') ); this.mvVideoAudioSearch(); - }else{ - //add the liks_info_div black back - $j('#dc_'+this.id).append('
'+ - '
' - ); - //start animation (make thumb small in upper left add in div for "loading" - $j('#img_thumb_'+this.id).animate({ - width:parseInt(parseInt(_this.width)/2), - height:parseInt(parseInt(_this.height)/2), - top:20, - left:10 - }, - 1000, - function(){ - //animation done.. add "loading" to div if empty - if($j('#liks_info_'+_this.id).html()==''){ - $j('#liks_info_'+_this.id).html(gM('mwe-loading_txt')); - } - } - ) - //now load roe if run the showNextPrevLinks - if(this.roe && this.media_element.addedROEData==false){ - do_request(this.roe, function(data) - { - _this.media_element.addROE(data); - _this.getNextPrevLinks(); - }); - }else{ - this.getNextPrevLinks(); + }else{ + this.onClipDoneDisp(); + } + }, + onClipDoneDisp:function(){ + //add the liks_info_div black back + $j('#dc_'+this.id).append('
'+ + '
' + ); + //start animation (make thumb small in upper left add in div for "loading" + $j('#img_thumb_'+this.id).animate({ + width:parseInt(parseInt(_this.width)/2), + height:parseInt(parseInt(_this.height)/2), + top:20, + left:10 + }, + 1000, + function(){ + //animation done.. add "loading" to div if empty + if($j('#liks_info_'+_this.id).html()==''){ + $j('#liks_info_'+_this.id).html(gM('mwe-loading_txt')); + } } - } + ) + //now load roe if run the showNextPrevLinks + if(this.roe && this.media_element.addedROEData==false){ + do_request(this.roe, function(data) + { + _this.media_element.addROE(data); + _this.getNextPrevLinks(); + }); + }else{ + this.getNextPrevLinks(); + } }, //@@todo we should merge getNextPrevLinks with textInterface .. there is repeated code between them. getNextPrevLinks:function(){ @@ -1332,7 +1337,8 @@ embedVideo.prototype = { } }else{ js_log('no annotative track found'); - $j('#liks_info_'+this.id).html('no metadata found for related links'); + //$j('#liks_info_'+this.id).html('no metadata found for related links'); + _this.doThumbnailHTML(); } //query current request time +|- 60s to get prev next speech links. }, diff --git a/js2/mwEmbed/libTimedText/mvTextInterface.js b/js2/mwEmbed/libTimedText/mvTextInterface.js index 3fc4c455b0..ad39da3ad2 100644 --- a/js2/mwEmbed/libTimedText/mvTextInterface.js +++ b/js2/mwEmbed/libTimedText/mvTextInterface.js @@ -18,15 +18,14 @@ mvTextInterface.prototype = { transcript_set:null, autoscroll:true, add_to_end_on_this_pass:false, - scrollTimerId:0, - found_tracks: false, + scrollTimerId:0, suportedMime:{ 'srt': 'text/x-srt', 'cmml': 'text/cmml' }, init:function( parentEmbed ){ - //init a new availableTracks obj: - this.availableTracks={}; + //init a new availableTracks obj: + this.availableTracks = new Array(); //set the parent embed object: this.pe=parentEmbed; //parse roe if not already done: @@ -73,7 +72,6 @@ mvTextInterface.prototype = { var langKey = subPage.title.split('.'); var extension = langKey.pop(); langKey = langKey.pop(); - if( ! _this.suportedMime[ extension ] ){ js_log('Error: unknown extension:'+ extension); continue; @@ -81,7 +79,7 @@ mvTextInterface.prototype = { if( !langData[ langKey] ){ js_log('Error: langkey:'+ langKey + ' not found'); - }else{ + }else{ var textElm = document.createElement('text'); $j(textElm).attr({ 'category' : 'SUB', @@ -95,7 +93,7 @@ mvTextInterface.prototype = { } //after all text loaded: _this.getParseTimedText_rowReady(); - }); //do_api_req({ + }); //do_api_req({ }); //function( subData ) { } }else{ @@ -112,38 +110,52 @@ mvTextInterface.prototype = { }, getParseTimedText_rowReady: function (){ var _this = this; + var found_tracks = false; //create timedTextObj js_log("mv_txt_load_:SHOW mv_txt_load_"); $j('#mv_txt_load_'+_this.pe.id).show(); //show the loading icon + + //setup edit link: + _this.editlink = ''; + if( this.pe.media_element.linkback ){ + _this.editlink = this.pe.media_element.linkback; + }else if(this.pe.wikiTitleKey && wgServer && wgScript) { //check for wikiTitleKey (for edit linkback) + //only local: + _this.editlink = wgServer + wgScript + '?title=TimedText:' + this.pe.wikiTitleKey +'.'+ wgContentLanguage + '.srt&action=edit'; + } $j.each( this.pe.media_element.sources, function(inx, source){ if( typeof source.id == 'undefined' || source.id == null ){ source.id = 'tt_' + inx; } - var tObj = new timedTextObj( source ); + var tObj = new timedTextObj( source ); //make sure its a valid timed text format (we have not loaded or parsed yet) : ( - if( tObj.lib != null ){ - js_log('adding Track: ' + source.id + ' to ' + _this.pe.id); - _this.availableTracks[ source.id ] = tObj; - //js_log( 'is : ' + source.id + ' default: ' + source.default ); + if( tObj.lib != null ){ + _this.availableTracks.push( tObj ); //display if requested: - if( source['default'] == "true" ){ + if( ( wgUserLanguage && source['lang'] == wgUserLanguage ) || source['default'] == "true" ){ //we did set at least one track by default tag - _this.found_tracks=true; - js_log('do load timed text: ' + source.id ); - _this.loadAndDisplay( source.id ); + found_tracks = true; + _this.loadAndDisplay( _this.availableTracks.length -1 ); }else{ - //don't load the track and don't display + //don't load the track and don't display } } }); - //no default clip found take the first_id - if(!_this.found_tracks){ - $j.each( _this.availableTracks, function(inx, sourceTrack){ - _this.loadAndDisplay( sourceTrack.id ); - _this.found_tracks=true; + //no default clip found take the userLanguage key if set: + if(!found_tracks){ + $j.each( _this.availableTracks, function(inx, source){ + _this.loadAndDisplay( inx ); + found_tracks=true; //return after loading first available return false; }); + } + //if nothing found anywhere give the not found msg: + if(!found_tracks){ + $j( '#metaBox_' + _this.pe.id).html( ''+ + '

' + gM('mwe-no_text_tracks_found') + '

' + + ''+ gM('mwe-add-edit-subs') + '' + ); } }, loadAndDisplay: function ( track_id){ @@ -240,13 +252,17 @@ mvTextInterface.prototype = { } }, setup_layout:function(){ + var _this = this; //check if we have already loaded the menu/body: if($j('#tt_mmenu_'+this.pe.id).length==0){ - $j('#metaBox_'+this.pe.id).html( - this.getMenu() + - this.getBody() - ); - this.doMenuBindings(); + //alert( this.availableTracks.length ); + if( this.availableTracks.length != 0 ){ + $j('#metaBox_'+this.pe.id).html( + this.getMenu() + + this.getBody() + ); + this.doMenuBindings(); + } } }, show:function(){ @@ -281,12 +297,15 @@ mvTextInterface.prototype = { //debugger; for(var i in _this.availableTracks){ //for in loop ok on object var checked = ( _this.availableTracks[i].display ) ? 'checked' : ''; - selHTML+='
  • '+ + selHTML+='
  • '+ _this.availableTracks[i].getTitle() + '
    • '; } selHTML+='' + ''; $j('#metaBox_'+_this.pe.id).append( selHTML ); + $j('.mvTsSelect').click(function(){ + _this.applyTsSelect(); + }); }, applyTsSelect:function(){ var _this = this; @@ -319,7 +338,7 @@ mvTextInterface.prototype = { if( cur_time!=0 ){ var search_for_range = true; //check if the current transcript is already where we want: - if($j('#mmbody_'+this.pe.id +' .tt_scroll_highlight').length != 0){ + if($j('#mmbody_' + this.pe.id + ' .tt_scroll_highlight').length != 0){ var curhl = $j('#mmbody_'+this.pe.id +' .tt_scroll_highlight').get(0); if(npt2seconds($j(curhl).attr('start') ) < cur_time && npt2seconds($j(curhl).attr('end') ) > cur_time){ @@ -391,21 +410,14 @@ mvTextInterface.prototype = { var as_checked = (this.autoscroll)?'checked':''; out += '
    '; out += $j.btnHtml( gM('mwe-select_transcript_set'), 'tt-select', 'shuffle'); - - _this.editlink = ''; - - if( this.pe.media_element.linkback ){ - _this.editlink = this.pe.media_element.linkback; - }else if(this.pe.wikiTitleKey && wgServer && wgScript) { //check for wikiTitleKey (for edit linkback) - //only local: - _this.editlink = wgServer + wgScript + '?title=TimedText:' + this.pe.wikiTitleKey +'.'+ wgContentLanguage + '.srt&action=edit'; - } + if(_this.editlink!='') out+=' ' + $j.btnHtml(gM('mwe-improve_transcript'), 'tt-improve', 'document', {href:_this.editlink, target:'_new'}); - out+=''+gM('mwe-auto_scroll') + ' ' + - $j.btnHtml(gM('mwe-close'), 'tt-close', 'circle-close'); + out+=''; + + out+=gM('mwe-auto_scroll') + $j.btnHtml(gM('mwe-close'), 'tt-close', 'circle-close'); + out+='
    '; return out; }, @@ -420,17 +432,11 @@ mvTextInterface.prototype = { $j( '#' + _this.pe.id).get(0).textInterface.getTsSelect(); return false; }); + $j(mt + '.tt-scroll').click(function(){ + _this.setAutoScroll(this.checked); + }); //use hard-coded link: - $j(mt + ' .tt-improve').btnBind(); - - //dobule check we have sublties (else add default missing msg) - //if nothing found anywhere update the loading icon to say no tracks found - if(!_this.found_tracks){ - $j( '#mmbody_' + _this.pe.id).html( ''+ - '

    ' + gM('mwe-no_text_tracks_found') + '

    ' + - ''+ gM('mwe-add-edit-subs') + '' - ); - } + $j(mt + ' .tt-improve').btnBind(); } } diff --git a/js2/remoteMwEmbed.js b/js2/remoteMwEmbed.js index 9e42f5eb94..e3ae2a9cd1 100644 --- a/js2/remoteMwEmbed.js +++ b/js2/remoteMwEmbed.js @@ -77,7 +77,7 @@ function rewrite_for_OggHandler( vidIdList ){ var pheight = $j( '#' + vidId ).height(); var tag_type = 'video'; - + // Check for audio if( pheight == '22' || pheight == '52') { //set width to parent width: