| Index: branches/MwEmbedStandAlone/mwEmbed.js |
| — | — | @@ -2146,7 +2146,7 @@ |
| 2147 | 2147 | // Special Hack for conditional jquery ui inclusion ( |
| 2148 | 2148 | // once |
| 2149 | 2149 | // Usability extension |
| 2150 | | - // registers the jquery.ui skin in mw.style |
| | 2150 | + // registers the jquery.ui skin in mw.style |
| 2151 | 2151 | if( mw.hasJQueryUiCss() ){ |
| 2152 | 2152 | mw.style[ 'ui_' + mw.getConfig( 'jQueryUISkin' ) ] = true; |
| 2153 | 2153 | } |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/tests/Player_ServerSideSeek.html |
| — | — | @@ -1,14 +1,30 @@ |
| 2 | 2 | <html> |
| 3 | 3 | <head> |
| 4 | | - <script type="text/javascript" src="http://html5.kaltura.org/js"></script> |
| | 4 | + <script type="text/javascript" src="../../../mwEmbedLoader.js"></script> |
| 5 | 5 | </head> |
| 6 | 6 | <body> |
| 7 | 7 | <h2>mwEmbed / archive.org server side seek</h2> |
| 8 | | - |
| 9 | | - <video poster="http://www.archive.org/download/night_of_the_living_dead/format=Thumbnail&x.jpg" |
| | 8 | + Start Playing at <input id="startTime" size="5" value ="20"></input> seconds. <input value="go" type="button" id="doPageSeek"></input></br> |
| | 9 | + <video id="vid1" poster="http://www.archive.org/download/night_of_the_living_dead/format=Thumbnail&x.jpg" |
| 10 | 10 | style="width:400px;height:300px" durationHint="5717.21"> |
| 11 | | - <source URLTimeEncoding="true" src="http://www.archive.org/download/night_of_the_living_dead/night_of_the_living_dead_512kb.mp4"/> |
| 12 | | - <source URLTimeEncoding="true" src="http://www.archive.org/download/night_of_the_living_dead/night_of_the_living_dead.ogv"/> |
| | 11 | + <source src="http://www.archive.org/download/night_of_the_living_dead/night_of_the_living_dead_512kb.mp4"/> |
| | 12 | + <source src="http://www.archive.org/download/night_of_the_living_dead/night_of_the_living_dead.ogv"/> |
| 13 | 13 | </video> |
| | 14 | + <script type="text/javascript"> |
| | 15 | + mw.ready( function(){ |
| | 16 | + // check for hash: |
| | 17 | + var urlParts = mw.parseUri( document.URL); |
| | 18 | + if( urlParts.anchor ){ |
| | 19 | + // run the start offset: |
| | 20 | + var startTime = urlParts.anchor.split('=')[1]; |
| | 21 | + $j('#vid1').get(0).currentTime = startTime; |
| | 22 | + $j('#vid1').get(0).play(); |
| | 23 | + } |
| | 24 | + // bind button: |
| | 25 | + $j('#doPageSeek').click(function(){ |
| | 26 | + document.location = 'Player_ServerSideSeek.html?' + Math.random(1) + '#start=' + $j("#startTime").val(); |
| | 27 | + }); |
| | 28 | + }); |
| | 29 | + </script> |
| 14 | 30 | </body> |
| 15 | 31 | </html> |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css |
| — | — | @@ -161,6 +161,7 @@ |
| 162 | 162 | font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; |
| 163 | 163 | font-size: 11px; |
| 164 | 164 | text-transform: uppercase; |
| | 165 | + text-align: center; |
| 165 | 166 | } |
| 166 | 167 | |
| 167 | 168 | .k-player .k-options span { |
| Index: branches/MwEmbedStandAlone/modules/P2PNextTransport/mw.P2PNextTransport.js |
| — | — | @@ -16,7 +16,7 @@ |
| 17 | 17 | |
| 18 | 18 | // Add the P2PNextTransport player to available player types: |
| 19 | 19 | $j( mw ).bind( 'EmbedPlayerManagerReady', function( event ) { |
| 20 | | - $.each( _this.getTransportObjects(), function(na, transportObject ){ |
| | 20 | + $j.each( _this.getTransportObjects(), function(na, transportObject ){ |
| 21 | 21 | |
| 22 | 22 | // Add the transportObject playerType |
| 23 | 23 | mw.EmbedTypes.getMediaPlayers().defaultPlayers[ transportObject.mime ] = [ transportObject.playerLib ]; |
| 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 = 'r190'; |
| | 8 | +var mwRemoteVersion = 'r191'; |
| 9 | 9 | |
| 10 | 10 | // Log the mwRemote version makes it easy to debug cache issues |
| 11 | 11 | if( window.console ){ |
| — | — | @@ -344,7 +344,7 @@ |
| 345 | 345 | return oldBodyHTML; |
| 346 | 346 | } |
| 347 | 347 | function mwAddCommonStyleSheet(){ |
| 348 | | - importStylesheetURI( mwEmbedHostPath + '/skins/common/mw.style.mwCommon.css?' + mwGetReqArgs() ); |
| | 348 | + importStylesheetURI( mwEmbedHostPath + '/skins/common/mw.style.mwCommon.css?' + mwGetReqArgs() ); |
| 349 | 349 | // Set the style to defined ( so that when mw won't load the style sheet again) |
| 350 | 350 | if( !mw.style ){ |
| 351 | 351 | mw.style = { 'mwCommon' : true }; |
| — | — | @@ -360,6 +360,7 @@ |
| 361 | 361 | // The jsPlayerRequest includes both javascript and style sheets for the embedPlayer |
| 362 | 362 | var jsPlayerRequest = [ |
| 363 | 363 | '$j.ui', |
| | 364 | + 'mw.style.ui_redmond', |
| 364 | 365 | '$j.widget', |
| 365 | 366 | '$j.ui.mouse', |
| 366 | 367 | |
| — | — | @@ -451,7 +452,12 @@ |
| 452 | 453 | }else{ |
| 453 | 454 | //mw.log(" rewrite: " + rewriteHTML + "\n of type: " + typeof rewriteHTML); |
| 454 | 455 | } |
| | 456 | + |
| 455 | 457 | var re = new RegExp( /videoUrl(":?\s*)*([^&]*)/ ); |
| | 458 | + var srcParts = re.exec( rewriteHTML ); |
| | 459 | + if(!srcParts){ |
| | 460 | + return ; |
| | 461 | + } |
| 456 | 462 | src = re.exec( rewriteHTML )[2]; |
| 457 | 463 | |
| 458 | 464 | var timeHash = ''; |
| — | — | @@ -678,7 +684,7 @@ |
| 679 | 685 | * @return {Boolean} true if objectPath exists false if objectPath is |
| 680 | 686 | * undefined |
| 681 | 687 | */ |
| 682 | | -mwIsset = function( objectPath ) { |
| | 688 | +window.mwIsset = function( objectPath ) { |
| 683 | 689 | if ( !objectPath || typeof objectPath != 'string') { |
| 684 | 690 | return false; |
| 685 | 691 | } |
| — | — | @@ -927,4 +933,4 @@ |
| 928 | 934 | } |
| 929 | 935 | } |
| 930 | 936 | return false; |
| 931 | | -} |
| \ No newline at end of file |
| | 937 | +} |