| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/mw.EmbedPlayer.js |
| — | — | @@ -2981,8 +2981,8 @@ |
| 2982 | 2982 | _this.volume = this.getPlayerElementVolume(); |
| 2983 | 2983 | |
| 2984 | 2984 | // update the mute state from the player element |
| 2985 | | - if( _this.muted != _this.getPlayerElementMuted() ){ |
| 2986 | | - mw.log("monitor:: muted does not mach embed player" ); |
| | 2985 | + if( _this.muted != _this.getPlayerElementMuted() && ! _this.isStopped() ){ |
| | 2986 | + mw.log( "EmbedPlayer::monitor: muted does not mach embed player" ); |
| 2987 | 2987 | _this.toggleMute(); |
| 2988 | 2988 | // Make sure they match: |
| 2989 | 2989 | _this.muted = _this.getPlayerElementMuted(); |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.PlayerSkinKskin.js |
| — | — | @@ -114,7 +114,8 @@ |
| 115 | 115 | 'top' : '0px', |
| 116 | 116 | 'left' : '0px', |
| 117 | 117 | 'bottom' : '0px', |
| 118 | | - 'right' : '45px' |
| | 118 | + 'right' : '45px', |
| | 119 | + 'overflow' : 'hidden' |
| 119 | 120 | } ) |
| 120 | 121 | for ( var menuItem in ctrlObj.supportedMenuItems ) { |
| 121 | 122 | $menuScreens.append( |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/mw.PlayerControlBuilder.js |
| — | — | @@ -605,7 +605,7 @@ |
| 606 | 606 | .animate( { |
| 607 | 607 | 'bottom' : 10 |
| 608 | 608 | }, 'slow' ); |
| 609 | | - |
| | 609 | + |
| 610 | 610 | }, |
| 611 | 611 | |
| 612 | 612 | /** |
| — | — | @@ -613,7 +613,7 @@ |
| 614 | 614 | */ |
| 615 | 615 | showControlBar: function(){ |
| 616 | 616 | var animateDuration = 'slow'; |
| 617 | | - $j( this.embedPlayer.getPlayerElement() ).css('z-index', '1') |
| | 617 | + $j( this.embedPlayer.getPlayerElement() ).css( 'z-index', '1' ) |
| 618 | 618 | mw.log( 'showControlBar' ); |
| 619 | 619 | // Move up text track if present |
| 620 | 620 | this.embedPlayer.$interface.find( '.track' ) |
| — | — | @@ -625,7 +625,7 @@ |
| 626 | 626 | ); |
| 627 | 627 | |
| 628 | 628 | // Show interface controls |
| 629 | | - this.embedPlayer.$interface.find( '.control-bar') |
| | 629 | + this.embedPlayer.$interface.find( '.control-bar' ) |
| 630 | 630 | .fadeIn( animateDuration ); |
| 631 | 631 | }, |
| 632 | 632 | |
| Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.FirefoggRender.js |
| — | — | @@ -177,7 +177,7 @@ |
| 178 | 178 | // Don't block on render |
| 179 | 179 | setTimeout( function(){ |
| 180 | 180 | _this.doNextFrame(); |
| 181 | | - }, 2 ); |
| | 181 | + }, 0); |
| 182 | 182 | } |
| 183 | 183 | }, true /* hide the buffer overlay */ ); |
| 184 | 184 | }, |
| Index: branches/MwEmbedStandAlone/modules/Sequencer/remotes/mw.MediaWikiRemoteSequencer.js |
| — | — | @@ -60,18 +60,23 @@ |
| 61 | 61 | $j( embedPlayer ).siblings( '.kalturaEditOverlay' ).fadeOut( 'fast' ); |
| 62 | 62 | }); |
| 63 | 63 | |
| 64 | | - $j( embedPlayer ).bind( 'pause', function() { |
| 65 | | - mw.remoteSequencerAddEditOverlay( embedPlayerId ) |
| | 64 | + $j( embedPlayer ).bind( 'pause', function() { |
| | 65 | + // don't display if near the end of playback ( causes double fade in conflict with ended event ) |
| | 66 | + mw.remoteSequencerAddEditOverlay( embedPlayerId ); |
| | 67 | + |
| 66 | 68 | // xxx should use getter setter |
| 67 | 69 | embedPlayer.controlBuilder.displayOptionsMenuFlag = true; |
| 68 | 70 | return true; |
| 69 | 71 | }); |
| 70 | 72 | |
| 71 | | - $j( embedPlayer ).bind( 'ended', function( onDoneAction ){ |
| | 73 | + $j( embedPlayer ).bind( 'ended', function( onDoneAction ){ |
| | 74 | + if( embedPlayer.currentTime != 0 ){ |
| | 75 | + return ; |
| | 76 | + } |
| 72 | 77 | // pause event should fire |
| 73 | 78 | mw.remoteSequencerAddEditOverlay( embedPlayerId ); |
| 74 | 79 | |
| 75 | | - // show the credits screen after 3 seconds 1/2 second to fade in |
| | 80 | + // show the credits screen after 3 seconds 1/2 seconds |
| 76 | 81 | setTimeout(function(){ |
| 77 | 82 | $j( embedPlayer ).siblings( '.kalturaEditOverlay' ).fadeOut( 'fast' ); |
| 78 | 83 | embedPlayer.$interface.find('.k-menu').fadeIn('fast'); |
| — | — | @@ -136,7 +141,7 @@ |
| 137 | 142 | 'background' : 'none repeat scroll 0 0 #FFF', |
| 138 | 143 | 'color' : 'black', |
| 139 | 144 | 'opacity': 0.9, |
| 140 | | - 'z-index': 999 |
| | 145 | + 'z-index': 1 |
| 141 | 146 | }) |
| 142 | 147 | .append( |
| 143 | 148 | $j('<div />') |
| Index: branches/MwEmbedStandAlone/modules/Sequencer/mw.SequencerServer.js |
| — | — | @@ -204,7 +204,7 @@ |
| 205 | 205 | 'title' : _this.titleKey, |
| 206 | 206 | 'text' : _this.wrapSequencerWikiText( sequenceXML ), |
| 207 | 207 | 'token': token |
| 208 | | - }; |
| | 208 | + }; |
| 209 | 209 | mw.getJSON( _this.getApiUrl(), request, function( data ) { |
| 210 | 210 | if( data.edit && data.edit.result == 'Success' ) { |
| 211 | 211 | // Update the latest local variables |
| Index: branches/MwEmbedStandAlone/remotes/mediaWiki.js |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | */ |
| 6 | 6 | var urlparts = getRemoteEmbedPath(); |
| 7 | 7 | var mwEmbedHostPath = urlparts[0]; |
| 8 | | -var mwRemoteVersion = 'r149'; |
| | 8 | +var mwRemoteVersion = 'r150'; |
| 9 | 9 | var mwUseScriptLoader = true; |
| 10 | 10 | |
| 11 | 11 | // Log the mwRemote version makes it easy to debug cache issues |
| — | — | @@ -170,7 +170,7 @@ |
| 171 | 171 | |
| 172 | 172 | window.mwSequencerRemote = new mw.MediaWikiRemoteSequencer({ |
| 173 | 173 | 'action': wgAction, |
| 174 | | - 'titleKey' : wgTitle, |
| | 174 | + 'titleKey' : wgPageName, |
| 175 | 175 | 'target' : '#bodyContent' |
| 176 | 176 | }); |
| 177 | 177 | window.mwSequencerRemote.drawUI(); |