| Index: branches/js2-work/phase3/js/mwEmbed/jquery/jquery.ui/ui/ui.slider.js |
| — | — | @@ -530,4 +530,3 @@ |
| 531 | 531 | }); |
| 532 | 532 | |
| 533 | 533 | })(jQuery); |
| 534 | | - |
| Index: branches/js2-work/phase3/js/mwEmbed/skins/kskin/kskinConfig.js |
| — | — | @@ -66,14 +66,8 @@ |
| 67 | 67 | 'optionsMenu': { |
| 68 | 68 | 'w' : 0, |
| 69 | 69 | 'o' : function( ctrlObj ) { |
| 70 | | - var embedPlayer = ctrlObj.embedPlayer; |
| | 70 | + var embedPlayer = ctrlObj.embedPlayer; |
| 71 | 71 | |
| 72 | | - |
| 73 | | - var menuOffset = ( embedPlayer.getPlayerHeight() < ctrlObj.getOverlayHeight() ) ? |
| 74 | | - 'top:' + + 'px;' : ''; |
| 75 | | - |
| 76 | | - |
| 77 | | - |
| 78 | 72 | $menuOverlay = $j( '<div />') |
| 79 | 73 | .attr('id', 'blackbg_' + embedPlayer.id ) |
| 80 | 74 | .addClass( 'k-menu ui-widget-content' ) |
| — | — | @@ -85,6 +79,7 @@ |
| 86 | 80 | // Setup menu offset ( if player height < getOverlayHeight ) |
| 87 | 81 | // This displays the menu outside of the player on small embeds |
| 88 | 82 | if ( embedPlayer.getPlayerHeight() < ctrlObj.getOverlayHeight() ) { |
| | 83 | + |
| 89 | 84 | $menuOverlay.css( 'top', parseInt( embedPlayer.getPlayerHeight() + ctrlObj.getControlBarHeight() ) + 'px' ); |
| 90 | 85 | |
| 91 | 86 | // Special common overflow hack for thumbnail display of player |
| — | — | @@ -130,7 +125,8 @@ |
| 131 | 126 | // Add the menuScreens to the menuOverlay |
| 132 | 127 | $menuOverlay.append( $menuScreens ); |
| 133 | 128 | |
| 134 | | - return $menuOverlay; |
| | 129 | + return $menuOverlay; |
| | 130 | + |
| 135 | 131 | } |
| 136 | 132 | } |
| 137 | 133 | }, |
| Index: branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | */ |
| 6 | 6 | var urlparts = getRemoteEmbedPath(); |
| 7 | 7 | var mwEmbedHostPath = urlparts[0]; |
| 8 | | -var mwRemoteVersion = 'r98'; |
| | 8 | +var mwRemoteVersion = 'r99'; |
| 9 | 9 | var mwUseScriptLoader = true; |
| 10 | 10 | |
| 11 | 11 | // Log the mwRemote version ( will determine what version of js we get ) |