| Index: branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js |
| — | — | @@ -232,7 +232,7 @@ |
| 233 | 233 | // See if we have native support for ogg: |
| 234 | 234 | var supporting_players = mw.EmbedTypes.players.getMIMETypePlayers( 'video/ogg' ); |
| 235 | 235 | for ( var i = 0; i < supporting_players.length; i++ ) { |
| 236 | | - if ( supporting_players[i].id == 'videoElement' ) { |
| | 236 | + if ( supporting_players[i].id == 'oggNative' ) { |
| 237 | 237 | return false; |
| 238 | 238 | } |
| 239 | 239 | } |
| — | — | @@ -248,8 +248,9 @@ |
| 249 | 249 | } |
| 250 | 250 | } |
| 251 | 251 | // No ogg src... no point in download firefox link |
| 252 | | - if ( !foundOgg ) |
| | 252 | + if ( !foundOgg ){ |
| 253 | 253 | return false; |
| | 254 | + } |
| 254 | 255 | } |
| 255 | 256 | return true; |
| 256 | 257 | }, |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/kplayerEmbed.js |
| — | — | @@ -8,13 +8,13 @@ |
| 9 | 9 | |
| 10 | 10 | // List of supported features: |
| 11 | 11 | supports: { |
| 12 | | - 'playHead':true, |
| 13 | | - 'pause':true, |
| 14 | | - 'stop':true, |
| 15 | | - 'timeDisplay':true, |
| 16 | | - 'volumeControl':true, |
| 17 | | - 'overlay':false, |
| 18 | | - 'fullscreen':false |
| | 12 | + 'playHead' : true, |
| | 13 | + 'pause' : true, |
| | 14 | + 'stop' : true, |
| | 15 | + 'timeDisplay' : true, |
| | 16 | + 'volumeControl' : true, |
| | 17 | + 'overlay' : true, |
| | 18 | + 'fullscreen' : false |
| 19 | 19 | }, |
| 20 | 20 | |
| 21 | 21 | /* |
| Index: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -1752,10 +1752,11 @@ |
| 1753 | 1753 | // Call the ctrlBuilder end event:: |
| 1754 | 1754 | |
| 1755 | 1755 | //if kalturaAttribution and k-skin show the "credits" screen: |
| 1756 | | - if( this.ctrlBuilder.showCredits ) { |
| | 1756 | + if( mw.getConfig( 'kalturaAttribution' ) && this.ctrlBuilder.showCredits ) { |
| 1757 | 1757 | this.ctrlBuilder.showCredits(); |
| 1758 | 1758 | return ; |
| 1759 | 1759 | } |
| | 1760 | + |
| 1760 | 1761 | // Related videos: |
| 1761 | 1762 | $j( '#img_thumb_' + this.id ).css( 'zindex', 1 ); |
| 1762 | 1763 | this.$interface.find( '.play-btn-large' ).hide(); |
| — | — | @@ -2959,7 +2960,7 @@ |
| 2960 | 2961 | default_players : { }, |
| 2961 | 2962 | |
| 2962 | 2963 | /** |
| 2963 | | - * Initializartion function defiens the default order for players for |
| | 2964 | + * Initializartion function sets the default order for players for |
| 2964 | 2965 | * a given mime type |
| 2965 | 2966 | */ |
| 2966 | 2967 | init : function() { |
| — | — | @@ -2978,10 +2979,9 @@ |
| 2979 | 2980 | this.default_players['text/html'] = ['html']; |
| 2980 | 2981 | this.default_players['image/jpeg'] = ['html']; |
| 2981 | 2982 | this.default_players['image/png'] = ['html']; |
| 2982 | | - this.default_players['image/svg'] = ['html']; |
| | 2983 | + this.default_players['image/svg'] = ['html']; |
| 2983 | 2984 | |
| 2984 | 2985 | |
| 2985 | | - |
| 2986 | 2986 | }, |
| 2987 | 2987 | |
| 2988 | 2988 | /** |