http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73336
Revision: 73336 Author: dale Date: 2010-09-19 16:39:02 +0000 (Sun, 19 Sep 2010) Log Message: ----------- * add 'for best playback' note to google chrome while http://code.google.com/p/chromium/issues/detail?id=56180 is outstanding Modified Paths: -------------- branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js =================================================================== --- branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js 2010-09-19 16:25:45 UTC (rev 73335) +++ branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js 2010-09-19 16:39:02 UTC (rev 73336) @@ -557,7 +557,7 @@ // Add recommend firefox if we have non-native playback: if ( _this.checkNativeWarning( ) ) { _this.doWarningBindinng( - 'showNativePlayerWarning', + 'EmbedPlayer.ShowNativeWarning', gM( 'mwe-embedplayer-for_best_experience' ) ); } @@ -673,17 +673,22 @@ // If the resolution is too small don't display the warning if( this.embedPlayer.getPlayerHeight() < 199 ){ return false; - } - + } // See if we have we have ogg support var supportingPlayers = mw.EmbedTypes.players.getMIMETypePlayers( 'video/ogg' ); for ( var i = 0; i < supportingPlayers.length; i++ ) { - if ( supportingPlayers[i].id == 'oggNative' ) { + + if ( supportingPlayers[i].id == 'oggNative' + && + // xxx google chrome has broken oggNative playback: + // http://code.google.com/p/chromium/issues/detail?id=56180 + ! /chrome/.test(navigator.userAgent.toLowerCase() ) + ){ return false; } } - // Check for h264 and or flash/flv source and playback support and dont' show wanring + // Check for h264 and or flash/flv source and playback support and don't show warning if( ( mw.EmbedTypes.players.getMIMETypePlayers( 'video/h264' ).length && this.embedPlayer.mediaElement.getSources( 'video/h264' ).length ) @@ -713,9 +718,8 @@ $j( embedPlayer ).hoverIntent({ 'timeout': 2000, - 'over': function() { - if ( $j( '#warningOverlay_' + embedPlayer.id ).length == 0 ) { - var toppos = ( embedPlayer.instanceOf == 'mvPlayList' ) ? 25 : 10; + 'over': function() { + if ( $j( '#warningOverlay_' + embedPlayer.id ).length == 0 ) { $j( this ).append( $j('<div />') @@ -728,7 +732,7 @@ 'display' : 'none', 'background' : '#FFF', 'color' : '#111', - 'top' : toppos + 'px', + 'top' : '10px', 'left' : '10px', 'right' : '10px', 'padding' : '4px' _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
