http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73570
Revision: 73570
Author: dale
Date: 2010-09-22 20:55:52 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
* some minor fixes for overlay display and control binding css issues
* bumped mwRemoteVersion for update
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/mw.FirefoggRender.js
branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
branches/MwEmbedStandAlone/remotes/mediaWiki.js
Modified: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-09-22 20:50:25 UTC (rev 73569)
+++ branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js
2010-09-22 20:55:52 UTC (rev 73570)
@@ -2981,8 +2981,8 @@
_this.volume = this.getPlayerElementVolume();
// update the mute state from the player element
- if( _this.muted != _this.getPlayerElementMuted() ){
- mw.log("monitor:: muted does not mach embed player" );
+ if( _this.muted != _this.getPlayerElementMuted() && !
_this.isStopped() ){
+ mw.log( "EmbedPlayer::monitor: muted does not mach
embed player" );
_this.toggleMute();
// Make sure they match:
_this.muted = _this.getPlayerElementMuted();
Modified:
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.PlayerSkinKskin.js
===================================================================
---
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.PlayerSkinKskin.js
2010-09-22 20:50:25 UTC (rev 73569)
+++
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.PlayerSkinKskin.js
2010-09-22 20:55:52 UTC (rev 73570)
@@ -114,7 +114,8 @@
'top' : '0px',
'left' : '0px',
'bottom' : '0px',
- 'right' : '45px'
+ 'right' : '45px',
+ 'overflow' : 'hidden'
} )
for ( var menuItem in
ctrlObj.supportedMenuItems ) {
$menuScreens.append(
Modified:
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
===================================================================
---
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
2010-09-22 20:50:25 UTC (rev 73569)
+++
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js
2010-09-22 20:55:52 UTC (rev 73570)
@@ -605,7 +605,7 @@
.animate( {
'bottom' : 10
}, 'slow' );
-
+
},
/**
@@ -613,7 +613,7 @@
*/
showControlBar: function(){
var animateDuration = 'slow';
- $j( this.embedPlayer.getPlayerElement() ).css('z-index', '1')
+ $j( this.embedPlayer.getPlayerElement() ).css( 'z-index', '1' )
mw.log( 'showControlBar' );
// Move up text track if present
this.embedPlayer.$interface.find( '.track' )
@@ -625,7 +625,7 @@
);
// Show interface controls
- this.embedPlayer.$interface.find( '.control-bar')
+ this.embedPlayer.$interface.find( '.control-bar' )
.fadeIn( animateDuration );
},
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
2010-09-22 20:50:25 UTC (rev 73569)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js
2010-09-22 20:55:52 UTC (rev 73570)
@@ -177,7 +177,7 @@
// Don't block on render
setTimeout( function(){
_this.doNextFrame();
- }, 2 );
+ }, 0);
}
}, true /* hide the buffer overlay */ );
},
Modified: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
===================================================================
--- branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-22 20:50:25 UTC (rev 73569)
+++ branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js
2010-09-22 20:55:52 UTC (rev 73570)
@@ -204,7 +204,7 @@
'title' : _this.titleKey,
'text' : _this.wrapSequencerWikiText(
sequenceXML ),
'token': token
- };
+ };
mw.getJSON( _this.getApiUrl(), request,
function( data ) {
if( data.edit && data.edit.result ==
'Success' ) {
// Update the latest local
variables
Modified:
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
===================================================================
---
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
2010-09-22 20:50:25 UTC (rev 73569)
+++
branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js
2010-09-22 20:55:52 UTC (rev 73570)
@@ -60,18 +60,23 @@
$j( embedPlayer ).siblings( '.kalturaEditOverlay'
).fadeOut( 'fast' );
});
- $j( embedPlayer ).bind( 'pause', function() {
- mw.remoteSequencerAddEditOverlay( embedPlayerId )
+ $j( embedPlayer ).bind( 'pause', function() {
+ // don't display if near the end of playback ( causes
double fade in conflict with ended event )
+ mw.remoteSequencerAddEditOverlay( embedPlayerId );
+
// xxx should use getter setter
embedPlayer.controlBuilder.displayOptionsMenuFlag =
true;
return true;
});
- $j( embedPlayer ).bind( 'ended', function( onDoneAction ){
+ $j( embedPlayer ).bind( 'ended', function( onDoneAction ){
+ if( embedPlayer.currentTime != 0 ){
+ return ;
+ }
// pause event should fire
mw.remoteSequencerAddEditOverlay( embedPlayerId );
- // show the credits screen after 3 seconds 1/2 second
to fade in
+ // show the credits screen after 3 seconds 1/2 seconds
setTimeout(function(){
$j( embedPlayer ).siblings(
'.kalturaEditOverlay' ).fadeOut( 'fast' );
embedPlayer.$interface.find('.k-menu').fadeIn('fast');
@@ -136,7 +141,7 @@
'background' : 'none repeat scroll 0 0 #FFF',
'color' : 'black',
'opacity': 0.9,
- 'z-index': 999
+ 'z-index': 1
})
.append(
$j('<div />')
Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-22 20:50:25 UTC
(rev 73569)
+++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-22 20:55:52 UTC
(rev 73570)
@@ -4,7 +4,7 @@
*/
var urlparts = getRemoteEmbedPath();
var mwEmbedHostPath = urlparts[0];
-var mwRemoteVersion = 'r149';
+var mwRemoteVersion = 'r150';
var mwUseScriptLoader = true;
// Log the mwRemote version makes it easy to debug cache issues
@@ -170,7 +170,7 @@
window.mwSequencerRemote = new
mw.MediaWikiRemoteSequencer({
'action': wgAction,
- 'titleKey' : wgTitle,
+ 'titleKey' : wgPageName,
'target' : '#bodyContent'
});
window.mwSequencerRemote.drawUI();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
