r66849 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r66848‎ | r66849 | r66850 >
Date:20:44, 24 May 2010
Author:dale
Status:deferred
Tags:
Comment:
fixed z-index level of full-screen captions menu
Modified paths:
  • /branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/ctrlBuilder.js (modified) (history)
  • /branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js (modified) (history)

Diff [purge]

Index: branches/MwEmbedStandAlone/modules/TimedText/mw.TimedText.js
@@ -230,7 +230,7 @@
231231 // NOTE: Button target should be an option or config
232232 $menuButton.unbind().menu( {
233233 'content' : _this.getMainMenu(),
234 - 'zindex' : mw.getConfig( 'fullScreenIndex' ),
 234+ 'zindex' : mw.getConfig( 'fullScreenIndex' )+2,
235235 'crumbDefaultText' : ' ',
236236 'autoShow': autoShow,
237237 'targetMenuContainer' : _this.menuTarget,
Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/ctrlBuilder.js
@@ -1208,19 +1208,21 @@
12091209 showTextInterface: function() {
12101210 var _this = this;
12111211 var embedPlayer = this.embedPlayer;
1212 - mw.log('ttt:showTextInterface::');
 1212+ var loc = embedPlayer.$interface.find( '.rButton.timed-text' ).offset();
 1213+ mw.log('showTextInterface::' + embedPlayer.id + ' t' + loc.top + ' r' + loc.right);
12131214
 1215+
12141216 var $menu = $j( '#timedTextMenu_' + embedPlayer.id );
1215 - //This may be unnessesary .. we just need to show a sppiner somewhere
 1217+ //This may be unnecessary .. we just need to show a spiner somewhere
12161218 if ( $menu.length != 0 ) {
12171219 // Hide show the menu:
12181220 if( $menu.is( ':visible' ) ) {
12191221 $menu.hide( "fast" );
12201222 }else{
 1223+ // move the menu to proper location
12211224 $menu.show("fast");
12221225 }
1223 - }else{
1224 - var loc = embedPlayer.$interface.find( '.rButton.timed-text' ).offset();
 1226+ }else{
12251227 //Setup the menu:
12261228 $j('body').append(
12271229 $j('<div>')
@@ -1237,8 +1239,7 @@
12381240
12391241 );
12401242 // Load text interface ( if not already loaded )
1241 - mw.load( 'TimedText', function() {
1242 - mw.log('ttt:TimedText CB .. do timedText bind::');
 1243+ mw.load( 'TimedText', function() {
12431244 $j( '#' + embedPlayer.id ).timedText( 'showMenu', '#timedTextMenu_' + embedPlayer.id );
12441245 });
12451246 }

Status & tagging log