http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66849
Revision: 66849
Author: dale
Date: 2010-05-24 20:44:08 +0000 (Mon, 24 May 2010)
Log Message:
-----------
fixed z-index level of full-screen captions menu
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/ctrlBuilder.js
branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/ctrlBuilder.js
===================================================================
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/ctrlBuilder.js
2010-05-24 20:15:39 UTC (rev 66848)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/ctrlBuilder.js
2010-05-24 20:44:08 UTC (rev 66849)
@@ -1208,19 +1208,21 @@
showTextInterface: function() {
var _this = this;
var embedPlayer = this.embedPlayer;
- mw.log('ttt:showTextInterface::');
+ var loc = embedPlayer.$interface.find( '.rButton.timed-text'
).offset();
+ mw.log('showTextInterface::' + embedPlayer.id + ' t' + loc.top
+ ' r' + loc.right);
+
var $menu = $j( '#timedTextMenu_' + embedPlayer.id );
- //This may be unnessesary .. we just need to show a sppiner
somewhere
+ //This may be unnecessary .. we just need to show a spiner
somewhere
if ( $menu.length != 0 ) {
// Hide show the menu:
if( $menu.is( ':visible' ) ) {
$menu.hide( "fast" );
}else{
+ // move the menu to proper location
$menu.show("fast");
}
- }else{
- var loc = embedPlayer.$interface.find(
'.rButton.timed-text' ).offset();
+ }else{
//Setup the menu:
$j('body').append(
$j('<div>')
@@ -1237,8 +1239,7 @@
);
// Load text interface ( if not already loaded )
- mw.load( 'TimedText', function() {
- mw.log('ttt:TimedText CB .. do timedText
bind::');
+ mw.load( 'TimedText', function() {
$j( '#' + embedPlayer.id ).timedText(
'showMenu', '#timedTextMenu_' + embedPlayer.id );
});
}
Modified: branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
===================================================================
--- branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
2010-05-24 20:15:39 UTC (rev 66848)
+++ branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
2010-05-24 20:44:08 UTC (rev 66849)
@@ -230,7 +230,7 @@
// NOTE: Button target should be an option or
config
$menuButton.unbind().menu( {
'content' : _this.getMainMenu(),
- 'zindex' : mw.getConfig(
'fullScreenIndex' ),
+ 'zindex' : mw.getConfig(
'fullScreenIndex' )+2,
'crumbDefaultText' : ' ',
'autoShow': autoShow,
'targetMenuContainer' :
_this.menuTarget,
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
