http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73704
Revision: 73704
Author: dale
Date: 2010-09-25 02:25:53 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
* lowered z-index of menu overlay ( bug 25285 )
* fixed SwamTransport post url2torrent response player update
* set timed text size relative to player interface size
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
branches/MwEmbedStandAlone/modules/SwarmTransport/mw.SwarmTransport.js
branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-09-25 02:19:36 UTC (rev 73703)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-09-25 02:25:53 UTC (rev 73704)
@@ -862,15 +862,8 @@
// Return the mime type string if not known type.
return this.mimeType;
- },
+ },
- /** Index accessor function.
- * @return {Integer} the source's index within the enclosing
mediaElement container.
- */
- getIndex : function() {
- return this.index;
- },
-
/**
*
* Get Duration of the media in milliseconds from the source url.
@@ -1605,7 +1598,7 @@
// only load from api if sources are empty:
if ( _this.apiTitleKey && this.mediaElement.sources.length ==
0) {
// Load media from external data
- mw.log( 'EmbedPlayer::checkPlayerSources: loading
apiTitleKey data' );
+ mw.log( 'EmbedPlayer::checkPlayerSources: loading
apiTitleKey:' + _this.apiTitleKey );
_this.loadSourceFromApi( function(){
finishCheckPlayerSources();
} );
@@ -1639,10 +1632,10 @@
'iiprop': 'url|size|dimensions|metadata',
'iiurlwidth': _this.width,
'redirects' : true // automatically resolve redirects
- }
-
+ };
+
// Run the request:
- mw.getJSON( mw.getApiProviderURL( this.apiProvider ), request,
function( data ){
+ mw.getJSON( mw.getApiProviderURL( _this.apiProvider ), request,
function( data ){
if ( data.query.pages ) {
for ( var i in data.query.pages ) {
if( i == '-1' ) {
@@ -2815,7 +2808,7 @@
* Update volume function ( called from interface updates )
* @param {float} percent Percent of full volume
*/
- setVolume: function( percent ) {
+ setVolume: function( percent, dissableTrigger ) {
// ignore NaN percent:
if( isNaN( percent ) ){
return ;
@@ -2831,7 +2824,7 @@
// Update the playerElement volume
this.setPlayerElementVolume( percent );
- //mw.log(" setVolume:: " + percent + ' this.volume is: ' +
this.volume);
+ //mw.log(" setVolume:: " + percent + ' this.volume is: ' +
this.volume);
$j( this ).trigger('volumeChanged', percent );
},
@@ -2973,7 +2966,7 @@
// Check if volume was set outside of embed player function
//mw.log( ' this.volume: ' + _this.volume + ' prev Volume:: '
+ _this.previousVolume );
- if( _this.volume != _this.previousVolume ) {
+ if( Math.round( _this.volume * 100 ) != Math.round(
_this.previousVolume * 100 ) ) {
_this.setInterfaceVolume( _this.volume );
$j( this ).trigger('volumeChanged', _this.volume );
}
@@ -3450,7 +3443,7 @@
for ( var i = 0; i < this.players.length; i++ ) {
if ( this.players[i].id == playerId ) {
selectedPlayer = this.players[i];
- mw.log( 'choosing ' + playerId + ' for ' +
mimeType );
+ mw.log( 'EmbedPlayer::setPlayerPreference:
choosing ' + playerId + ' for ' + mimeType );
this.preference[ mimeType ] = playerId;
mw.setUserConfig( 'playerPref', this.preference
);
break;
@@ -3464,7 +3457,7 @@
if ( embed.mediaElement.selectedSource && (
embed.mediaElement.selectedSource.mimeType == mimeType ) )
{
embed.selectPlayer( selectedPlayer );
- mw.log( 'using ' +
embed.selectedPlayer.getName() + ' for ' +
embed.mediaElement.selectedSource.getTitle() );
+ mw.log(
'EmbedPlayer::setPlayerPreference: using ' + embed.selectedPlayer.getName() +
' for ' + embed.mediaElement.selectedSource.getTitle() );
}
}
}
Modified:
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
===================================================================
---
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
2010-09-25 02:19:36 UTC (rev 73703)
+++
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
2010-09-25 02:25:53 UTC (rev 73704)
@@ -188,7 +188,7 @@
opacity: 0.9;
position: absolute;
top: 0;
- z-index: 999;
+ z-index: 2;
}
.k-player .k-menu-bar li a {
Modified:
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
===================================================================
---
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
2010-09-25 02:19:36 UTC (rev 73703)
+++
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
2010-09-25 02:25:53 UTC (rev 73704)
@@ -250,7 +250,7 @@
/**
* Get the fullscreen text css
*/
- getFullscreenTextCss: function() {
+ getInterfaceSizeTextCss: function() {
// Some arbitrary scale relative to window size
var textSize = ( $j( window ).width() / 8 ) + 20;
if( textSize < 95 ) textSize = 95;
@@ -375,7 +375,7 @@
.animate( _this.getFullscreenPlayerCss() );
// Resize the timed text font size per window width
- $interface.find( '.track' ).css( _this.getFullscreenTextCss()
);
+ $interface.find( '.track' ).css(
_this.getInterfaceSizeTextCss() );
// Reposition play-btn-large ( this is unfortunately not easy
to position with 'margin': 'auto'
$interface.find('.play-btn-large').animate(
_this.getFullscreenPlayButtonCss() )
@@ -421,7 +421,7 @@
$interface.find('.play-btn-large').css(
_this.getFullscreenPlayButtonCss() );
// Update the timed text size
- $interface.find( '.track' ).css(
_this.getFullscreenTextCss() );
+ $interface.find( '.track' ).css(
_this.getInterfaceSizeTextCss() );
}
});
@@ -615,7 +615,9 @@
var animateDuration = 'slow';
if(! this.embedPlayer )
return ;
- $j( this.embedPlayer.getPlayerElement() ).css( 'z-index', '1' )
+ if( this.embedPlayer.getPlayerElement ){
+ $j( this.embedPlayer.getPlayerElement() ).css(
'z-index', '1' )
+ }
mw.log( 'showControlBar' );
// Move up text track if present
this.embedPlayer.$interface.find( '.track' )
@@ -1176,7 +1178,9 @@
* @param {Object} $target jQuery target for output
*/
getPlayerSelect: function( ) {
- mw.log('getPlayerSelect::');
+ mw.log('ControlBuilder::getPlayerSelect: source:' +
+
this.embedPlayer.mediaElement.selectedSource.getSrc() +
+ ' player: ' +
this.embedPlayer.selectedPlayer.id );
var embedPlayer = this.embedPlayer;
@@ -1190,22 +1194,22 @@
$j.each( embedPlayer.mediaElement.getPlayableSources(),
function( sourceId, source ) {
- var playable = mw.EmbedTypes.players.defaultPlayer(
source.getMIMEType() );
- var is_selected = ( source ==
embedPlayer.mediaElement.selectedSource );
+ var isPlayable = (typeof
mw.EmbedTypes.players.defaultPlayer( source.getMIMEType() ) == 'object' );
+ var is_selected = ( source.getSrc() ==
embedPlayer.mediaElement.selectedSource.getSrc() );
$playerSelect.append(
$j( '<h2 />' )
.text( source.getTitle() )
);
- if ( playable ) {
+ if ( isPlayable ) {
$playerList = $j('<ul />');
// output the player select code:
var supportingPlayers =
mw.EmbedTypes.players.getMIMETypePlayers( source.getMIMEType() );
- for ( var i = 0; i < supportingPlayers.length ;
i++ ) {
-
+ for ( var i = 0; i < supportingPlayers.length ;
i++ ) {
+
// Add link to select the player if not
already selected )
if( embedPlayer.selectedPlayer.id ==
supportingPlayers[i].id && is_selected ) {
// Active player ( no link )
Modified: branches/MwEmbedStandAlone/modules/SwarmTransport/mw.SwarmTransport.js
===================================================================
--- branches/MwEmbedStandAlone/modules/SwarmTransport/mw.SwarmTransport.js
2010-09-25 02:19:36 UTC (rev 73703)
+++ branches/MwEmbedStandAlone/modules/SwarmTransport/mw.SwarmTransport.js
2010-09-25 02:25:53 UTC (rev 73704)
@@ -25,7 +25,7 @@
_this.addSwarmSource( embedPlayer,
function(){
// Update the source if paused
if( embedPlayer.paused ) {
-
embedPlayer.mediaElement.autoSelectSource();
+
embedPlayer.setupSourcePlayer();
}
});
}
Modified: branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
===================================================================
--- branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
2010-09-25 02:19:36 UTC (rev 73703)
+++ branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
2010-09-25 02:25:53 UTC (rev 73704)
@@ -769,12 +769,11 @@
$j('<span \>')
)
- // If in fullscreen mode update the text size:
- if(
this.embedPlayer.controlBuilder.fullscreenMode ){
- $track.css(
-
this.embedPlayer.controlBuilder.getFullscreenTextCss()
- );
- }
+ // Scale the text Relative to player size:
+ $track.css(
+
this.embedPlayer.controlBuilder.getInterfaceSizeTextCss()
+ );
+
$playerTarget.append( $track );
// Resize the interface for layoutMode ==
'ontop' ( if not in fullscreen )
// NOTE this shoudl be a call to controlBuilder
not handled here inline
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
