http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63100
Revision: 63100
Author: dale
Date: 2010-02-28 21:28:04 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
* fixed low resolution display of menu overlay
* fixed switching playback-engine overlay menu options screen updates.
Modified Paths:
--------------
branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js
branches/js2-work/phase3/js/mwEmbed/skins/kskin/kskinConfig.js
Modified: branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js 2010-02-28
21:27:38 UTC (rev 63099)
+++ branches/js2-work/phase3/js/mwEmbed/skins/ctrlBuilder.js 2010-02-28
21:28:04 UTC (rev 63100)
@@ -89,11 +89,11 @@
// Set up local ctrlBuilder
var _this = this;
- // Remove any old controls:
- embedPlayer.$interface.find( '.control-bar' ).remove();
+ // Remove any old controls & old overlays:
+ embedPlayer.$interface.find( '.control-bar,.overlay-win'
).remove();
// Setup the controlBar container
- var $controlBar = $j('<div>')
+ var $controlBar = $j('<div />')
.addClass( 'ui-state-default ui-widget-header
ui-helper-clearfix control-bar' )
.css( 'height', this.height )
@@ -996,7 +996,7 @@
* @param {Object} $target jQuery target for output
*/
getPlayerSelect: function( ) {
- mw.log('getPlayerSelect');
+ mw.log('getPlayerSelect::');
var embedPlayer = this.embedPlayer;
Modified: branches/js2-work/phase3/js/mwEmbed/skins/kskin/kskinConfig.js
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/skins/kskin/kskinConfig.js
2010-02-28 21:27:38 UTC (rev 63099)
+++ branches/js2-work/phase3/js/mwEmbed/skins/kskin/kskinConfig.js
2010-02-28 21:28:04 UTC (rev 63100)
@@ -60,22 +60,27 @@
var embedPlayer = ctrlObj.embedPlayer;
$menuOverlay = $j( '<div />')
- .addClass( 'k-menu ui-widget-content' )
+ .addClass( 'overlay-win k-menu
ui-widget-content' )
.css( {
'width' : '100%',
'position': 'absolute',
'top' : '0px',
'bottom' : (
ctrlObj.getHeight() + 2 ) + 'px'
} );
-
- if( embedPlayer.getPlayerHeight() == '0' ){
- $menuOverlay.css( "height",
ctrlObj.getOverlayHeight() )
- }
+
// Setup menu offset ( if player height <
getOverlayHeight )
// This displays the menu outside of the player
on small embeds
if ( embedPlayer.getPlayerHeight() <
ctrlObj.getOverlayHeight() ) {
-
- $menuOverlay.css( 'top', parseInt(
embedPlayer.getPlayerHeight() + ctrlObj.getHeight() ) + 'px' );
+ var topPos = (
ctrlObj.checkOverlayControls() )
+ ?
embedPlayer.getPlayerHeight()
+ :
embedPlayer.getPlayerHeight() + ctrlObj.getHeight();
+
+ $menuOverlay.css( {
+ 'top' : topPos + 'px',
+ 'bottom' : null,
+ 'height' :
ctrlObj.getOverlayHeight() + 'px'
+ });
+
// Special common overflow hack for
thumbnail display of player
$j( embedPlayer ).parents(
'.thumbinner' ).css( 'overflow', 'visible' );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
