From 921025d048300354258b1f23217aea2ce7fb61fd Mon Sep 17 00:00:00 2001 From: Michael Dale Date: Sat, 7 Nov 2009 13:27:21 +0000 Subject: [PATCH] * more rewrite fixes --- js2/remoteMwEmbed.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/js2/remoteMwEmbed.js b/js2/remoteMwEmbed.js index e88af4dee3..3037a7c8f6 100644 --- a/js2/remoteMwEmbed.js +++ b/js2/remoteMwEmbed.js @@ -84,13 +84,16 @@ function rewrite_for_OggHandler( vidIdList ){ // Parsed values: var src = ''; - var duration = ''; + var duration_attr = ''; var wikiTitleKey = $j( '#'+vidId + ' img').filter(':first').attr('alt').replace(/ /g, '_'); var re = new RegExp( /videoUrl(":?\s*)*([^&]*)/ ); src = re.exec( $j( '#'+vidId ).html() )[2]; - var re = new RegExp( /length(":?\s*)*([^&]*)/ ); - duration = re.exec( $j( '#'+vidId ).html() )[2]; + var re = new RegExp( /length(":?\s*)*([^,]*)/ ); + var dv = re.exec( $j( '#'+vidId ).html() )[2]; + if( dv ){ + duration_attr = 'durationHint="'+ dv +'" '; + } var re = new RegExp( /offset(":?\s*)*([^&]*)/ ); offset = re.exec( $j( '#'+vidId ).html() )[2]; @@ -99,10 +102,10 @@ function rewrite_for_OggHandler( vidIdList ){ if( src ) { var html_out = ''; - var common_attr = ' id="vid_' + i +'" '+ + var common_attr = ' id="mwe_' + vidId +'" '+ 'wikiTitleKey="' + wikiTitleKey + '" ' + 'src="' + src + '" ' + - 'durationHint="' + duration + '" ' + + duration_attr + offset_attr + ' '; if( tag_type == 'audio' ){ @@ -118,7 +121,7 @@ function rewrite_for_OggHandler( vidIdList ){ .css('height', pheight + 30); } - rewrite_by_id( vidId, function(){ + rewrite_by_id( 'mwe_' + vidId, function(){ if(vidIdList.length != 0){ alert('did first rewite now doing another'); setTimeout( function(){ -- 2.20.1