| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css |
| — | — | @@ -336,6 +336,7 @@ |
| 337 | 337 | .k-player .menu-screen { |
| 338 | 338 | height: 100%; |
| 339 | 339 | overflow-y: auto; |
| | 340 | + overflow-x: hide; |
| 340 | 341 | } |
| 341 | 342 | |
| 342 | 343 | |
| Index: branches/MwEmbedStandAlone/remotes/AddMediaWizardEditPage.js |
| — | — | @@ -89,6 +89,6 @@ |
| 90 | 90 | } ); |
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | | - }, 200 ) |
| | 93 | + }, 100 ) |
| 94 | 94 | |
| 95 | 95 | } ); |
| Index: branches/MwEmbedStandAlone/remotes/mediaWiki.js |
| — | — | @@ -36,7 +36,6 @@ |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
| 40 | | - |
| 41 | 40 | // Setup up some globals to wrap mwEmbed mw.ready and mw.setConfig functions |
| 42 | 41 | |
| 43 | 42 | //Setup preMwEmbedReady queue |
| — | — | @@ -71,9 +70,11 @@ |
| 72 | 71 | * Wikimedia specific config |
| 73 | 72 | ********************************/ |
| 74 | 73 | mw.setConfig( 'Sequencer.KalturaPlayerEditOverlay', true ); |
| | 74 | +mw.setConfig( 'EmbedPlayer.KalturaAttribution', true ); |
| 75 | 75 | mw.setConfig( 'SwarmTransport.Enable', true ); |
| 76 | 76 | mw.setConfig( 'SmilPlayer.AssetDomainWhiteList', ['upload.wikimedia.org'] ); |
| 77 | 77 | |
| | 78 | + |
| 78 | 79 | // Use wikibits onLoad hook: ( since we don't have js2 / mw object loaded ) |
| 79 | 80 | addOnloadHook( function() { |
| 80 | 81 | doPageSpecificRewrite(); |
| — | — | @@ -93,18 +94,20 @@ |
| 94 | 95 | // Add media wizard ( only if not on a sequence page |
| 95 | 96 | if ( wgAction == 'edit' || wgAction == 'submit' ) { |
| 96 | 97 | if( wgPageName.indexOf( "Sequence:" ) != 0 ){ |
| 97 | | - loadMwEmbed( [ |
| 98 | | - 'mw.RemoteSearchDriver', |
| 99 | | - 'mw.ClipEdit', |
| 100 | | - 'mw.style.ClipEdit', |
| 101 | | - '$j.fn.textSelection', |
| 102 | | - '$j.ui', |
| 103 | | - '$j.widget', |
| 104 | | - '$j.ui.mouse', |
| 105 | | - '$j.ui.sortable' |
| 106 | | - ], function() { |
| 107 | | - mw.load( mwEmbedHostPath + '/remotes/AddMediaWizardEditPage.js?' + mwGetReqArgs() ); |
| 108 | | - } ); |
| | 98 | + setTimeout(function(){ |
| | 99 | + loadMwEmbed( [ |
| | 100 | + 'mw.RemoteSearchDriver', |
| | 101 | + 'mw.ClipEdit', |
| | 102 | + 'mw.style.ClipEdit', |
| | 103 | + '$j.fn.textSelection', |
| | 104 | + '$j.ui', |
| | 105 | + '$j.widget', |
| | 106 | + '$j.ui.mouse', |
| | 107 | + '$j.ui.sortable' |
| | 108 | + ], function() { |
| | 109 | + mw.load( mwEmbedHostPath + '/remotes/AddMediaWizardEditPage.js?' + mwGetReqArgs() ); |
| | 110 | + } ); |
| | 111 | + },100); |
| 109 | 112 | return ; |
| 110 | 113 | } |
| 111 | 114 | } |
| — | — | @@ -565,7 +568,7 @@ |
| 566 | 569 | || |
| 567 | 570 | // force load jquery if version 1.3.2 ( issues with '1.3.2' .data handling ) |
| 568 | 571 | jQuery.fn.jquery == '1.3.2') |
| 569 | | - { |
| | 572 | + { |
| 570 | 573 | rurl += 'window.jQuery'; |
| 571 | 574 | coma = ','; |
| 572 | 575 | } |