http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72946
Revision: 72946
Author: dale
Date: 2010-09-14 00:13:47 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
fixed menu overlay conflict with kalturaEditOverlay
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.PlayerSkinKskin.js
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-09-14 00:05:14 UTC (rev 72945)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-09-14 00:13:47 UTC (rev 72946)
@@ -2643,7 +2643,7 @@
doLinkBack: function() {
if ( ! this.linkback && this.roe &&
this.mediaElement.addedROEData == false ) {
var _this = this;
- this.displayOverlay( gM( 'mwe-embedplayer-loading_txt'
) );
+ this.displayMenuOverlay( gM(
'mwe-embedplayer-loading_txt' ) );
this.getMvJsonUrl( this.roe, function( data ) {
_this.mediaElement.addROE( data );
_this.doLinkBack();
@@ -2654,7 +2654,7 @@
} else if ( this.mediaElement.linkback ) {
window.location = this.mediaElement.linkback;
} else {
- this.displayOverlay( gM(
'mwe-embedplayer-could_not_find_linkback' ) );
+ this.displayMenuOverlay( gM(
'mwe-embedplayer-could_not_find_linkback' ) );
}
}
},
Modified:
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.PlayerSkinKskin.js
===================================================================
---
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.PlayerSkinKskin.js
2010-09-14 00:05:14 UTC (rev 72945)
+++
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.PlayerSkinKskin.js
2010-09-14 00:13:47 UTC (rev 72946)
@@ -206,6 +206,9 @@
.text ( gM( 'mwe-embedplayer-menu_btn' ) );
} );
this.$playerTarget.find( '.play-btn-large' ).fadeIn( 'fast' );
+
+ // re display the control bar if hidden:
+ this.showControlBar();
// Set close overlay menu flag:
this.displayOptionsMenuFlag = false;
@@ -224,6 +227,8 @@
} );
this.$playerTarget.find( '.play-btn-large' ).fadeOut( 'fast' );
+ $j(embedPlayer).trigger( 'displayMenuOverlay' );
+
// Set the Options Menu display flag to true:
this.displayOptionsMenuFlag = true;
},
Modified:
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
===================================================================
---
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
2010-09-14 00:05:14 UTC (rev 72945)
+++
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
2010-09-14 00:13:47 UTC (rev 72946)
@@ -904,7 +904,7 @@
gM( 'mwe-embedplayer-choose_player' ),
'gear',
function( ) {
- ctrlObj.displayOverlay(
+ ctrlObj.displayMenuOverlay(
ctrlObj.getPlayerSelect()
);
}
@@ -917,7 +917,7 @@
gM( 'mwe-embedplayer-download' ),
'disk',
function( ) {
- ctrlObj.displayOverlay(
gM('mwe-embedplayer-loading_txt' ) );
+ ctrlObj.displayMenuOverlay(
gM('mwe-embedplayer-loading_txt' ) );
// Call show download with the target
to be populated
ctrlObj.showDownload(
ctrlObj.embedPlayer.$interface.find( '.overlay-content' )
@@ -933,7 +933,7 @@
gM( 'mwe-embedplayer-share' ),
'mail-closed',
function( ) {
- ctrlObj.displayOverlay(
+ ctrlObj.displayMenuOverlay(
ctrlObj.getShare()
);
$j( ctrlObj.embedPlayer ).trigger(
'showShareEvent' );
@@ -946,7 +946,7 @@
gM( 'mwe-embedplayer-about-library' ),
'info',
function( ) {
- ctrlObj.displayOverlay(
+ ctrlObj.displayMenuOverlay(
ctrlObj.aboutPlayerLibrary()
);
$j( ctrlObj.embedPlayer
).trigger( 'aboutPlayerLibrary' );
@@ -961,8 +961,8 @@
closeMenuOverlay: function(){
var _this = this;
var embedPlayer = this.embedPlayer;
- var $overlay = embedPlayer.$interface.find(
'.overlay-win,.ui-widget-overlay,.ui-widget-shadow' );
-
+ var $overlay = embedPlayer.$interface.find(
'.overlay-win,.ui-widget-overlay,.ui-widget-shadow' );
+
this.displayOptionsMenuFlag = false;
mw.log(' closeMenuOverlay: ' + this.displayOptionsMenuFlag);
@@ -971,6 +971,9 @@
} );
// Show the big play button:
embedPlayer.$interface.find( '.play-btn-large' ).fadeIn( 'slow'
);
+
+ $j(embedPlayer).trigger( 'closeMenuOverlay' );
+
return false; // onclick action return false
},
@@ -991,6 +994,8 @@
if ( !this.supportedComponets[ 'overlays' ] ) {
embedPlayer.stop();
}
+
+
// Hide the big play button:
embedPlayer.$interface.find( '.play-btn-large' ).hide();
@@ -1065,6 +1070,11 @@
.find( '.overlay-win' )
.fadeIn( "slow" );
+
+ // trigger menu overlay display
+ alert('triger displayMenuOverlay');
+ $j(embedPlayer).trigger( 'displayMenuOverlay' );
+
return false; // onclick action return false
},
aboutPlayerLibrary: function(){
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
===================================================================
---
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
2010-09-14 00:05:14 UTC (rev 72945)
+++
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
2010-09-14 00:13:47 UTC (rev 72946)
@@ -52,14 +52,21 @@
// Add player pause binding if config is set::
$j( mw ).bind( 'newEmbedPlayerEvent', function( event, embedPlayerId ) {
if( mw.getConfig( 'Sequencer.KalturaPlayerEditOverlay' )){
+
var embedPlayer = $j( '#' + embedPlayerId ).get(0);
-
+
+ // hide if the main menu is requested
+ $j( embedPlayer ).bind( 'displayMenuOverlay', function(){
+ $j( embedPlayer ).siblings( '.kalturaEditOverlay'
).fadeOut( 'fast' );
+ });
+
$j( embedPlayer ).bind( 'pause', function() {
mw.remoteSequencerAddEditOverlay( embedPlayerId )
// xxx should use getter setter
embedPlayer.controlBuilder.displayOptionsMenuFlag =
true;
return true;
- })
+ });
+
$j( embedPlayer ).bind( 'ended', function( onDoneAction ){
// pause event should fire
mw.remoteSequencerAddEditOverlay( embedPlayerId );
@@ -80,6 +87,7 @@
embedPlayer.controlBuilder.displayOptionsMenuFlag =
false;
return true ;
});
+
}
});
mw.remoteSequencerAddEditOverlay = function( embedPlayerId ){
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
