Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js |
— | — | @@ -557,7 +557,7 @@ |
558 | 558 | // Add recommend firefox if we have non-native playback: |
559 | 559 | if ( _this.checkNativeWarning( ) ) { |
560 | 560 | _this.doWarningBindinng( |
561 | | - 'showNativePlayerWarning', |
| 561 | + 'EmbedPlayer.ShowNativeWarning', |
562 | 562 | gM( 'mwe-embedplayer-for_best_experience' ) |
563 | 563 | ); |
564 | 564 | } |
— | — | @@ -673,17 +673,22 @@ |
674 | 674 | // If the resolution is too small don't display the warning |
675 | 675 | if( this.embedPlayer.getPlayerHeight() < 199 ){ |
676 | 676 | return false; |
677 | | - } |
678 | | - |
| 677 | + } |
679 | 678 | // See if we have we have ogg support |
680 | 679 | var supportingPlayers = mw.EmbedTypes.players.getMIMETypePlayers( 'video/ogg' ); |
681 | 680 | for ( var i = 0; i < supportingPlayers.length; i++ ) { |
682 | | - if ( supportingPlayers[i].id == 'oggNative' ) { |
| 681 | + |
| 682 | + if ( supportingPlayers[i].id == 'oggNative' |
| 683 | + && |
| 684 | + // xxx google chrome has broken oggNative playback: |
| 685 | + // http://code.google.com/p/chromium/issues/detail?id=56180 |
| 686 | + ! /chrome/.test(navigator.userAgent.toLowerCase() ) |
| 687 | + ){ |
683 | 688 | return false; |
684 | 689 | } |
685 | 690 | } |
686 | 691 | |
687 | | - // Check for h264 and or flash/flv source and playback support and dont' show wanring |
| 692 | + // Check for h264 and or flash/flv source and playback support and don't show warning |
688 | 693 | if( |
689 | 694 | ( mw.EmbedTypes.players.getMIMETypePlayers( 'video/h264' ).length |
690 | 695 | && this.embedPlayer.mediaElement.getSources( 'video/h264' ).length ) |
— | — | @@ -713,9 +718,8 @@ |
714 | 719 | |
715 | 720 | $j( embedPlayer ).hoverIntent({ |
716 | 721 | 'timeout': 2000, |
717 | | - 'over': function() { |
718 | | - if ( $j( '#warningOverlay_' + embedPlayer.id ).length == 0 ) { |
719 | | - var toppos = ( embedPlayer.instanceOf == 'mvPlayList' ) ? 25 : 10; |
| 722 | + 'over': function() { |
| 723 | + if ( $j( '#warningOverlay_' + embedPlayer.id ).length == 0 ) { |
720 | 724 | |
721 | 725 | $j( this ).append( |
722 | 726 | $j('<div />') |
— | — | @@ -728,7 +732,7 @@ |
729 | 733 | 'display' : 'none', |
730 | 734 | 'background' : '#FFF', |
731 | 735 | 'color' : '#111', |
732 | | - 'top' : toppos + 'px', |
| 736 | + 'top' : '10px', |
733 | 737 | 'left' : '10px', |
734 | 738 | 'right' : '10px', |
735 | 739 | 'padding' : '4px' |