http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72402
Revision: 72402
Author: dale
Date: 2010-09-05 09:09:52 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
added a delay to loading mwEmbed to give the edit toolbar a chance to build out
Modified Paths:
--------------
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
branches/MwEmbedStandAlone/remotes/AddMediaWizardEditPage.js
branches/MwEmbedStandAlone/remotes/mediaWiki.js
Modified:
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
===================================================================
---
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
2010-09-05 08:52:31 UTC (rev 72401)
+++
branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/kskin/mw.style.PlayerSkinKskin.css
2010-09-05 09:09:52 UTC (rev 72402)
@@ -336,6 +336,7 @@
.k-player .menu-screen {
height: 100%;
overflow-y: auto;
+ overflow-x: hide;
}
Modified: branches/MwEmbedStandAlone/remotes/AddMediaWizardEditPage.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/AddMediaWizardEditPage.js
2010-09-05 08:52:31 UTC (rev 72401)
+++ branches/MwEmbedStandAlone/remotes/AddMediaWizardEditPage.js
2010-09-05 09:09:52 UTC (rev 72402)
@@ -89,6 +89,6 @@
} );
}
}
- }, 200 )
+ }, 100 )
} );
Modified: branches/MwEmbedStandAlone/remotes/mediaWiki.js
===================================================================
--- branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-05 08:52:31 UTC
(rev 72401)
+++ branches/MwEmbedStandAlone/remotes/mediaWiki.js 2010-09-05 09:09:52 UTC
(rev 72402)
@@ -36,7 +36,6 @@
}
-
// Setup up some globals to wrap mwEmbed mw.ready and mw.setConfig functions
//Setup preMwEmbedReady queue
@@ -71,9 +70,11 @@
* Wikimedia specific config
********************************/
mw.setConfig( 'Sequencer.KalturaPlayerEditOverlay', true );
+mw.setConfig( 'EmbedPlayer.KalturaAttribution', true );
mw.setConfig( 'SwarmTransport.Enable', true );
mw.setConfig( 'SmilPlayer.AssetDomainWhiteList', ['upload.wikimedia.org'] );
+
// Use wikibits onLoad hook: ( since we don't have js2 / mw object loaded )
addOnloadHook( function() {
doPageSpecificRewrite();
@@ -93,18 +94,20 @@
// Add media wizard ( only if not on a sequence page
if ( wgAction == 'edit' || wgAction == 'submit' ) {
if( wgPageName.indexOf( "Sequence:" ) != 0 ){
- loadMwEmbed( [
- 'mw.RemoteSearchDriver',
- 'mw.ClipEdit',
- 'mw.style.ClipEdit',
- '$j.fn.textSelection',
- '$j.ui',
- '$j.widget',
- '$j.ui.mouse',
- '$j.ui.sortable'
- ], function() {
- mw.load( mwEmbedHostPath +
'/remotes/AddMediaWizardEditPage.js?' + mwGetReqArgs() );
- } );
+ setTimeout(function(){
+ loadMwEmbed( [
+ 'mw.RemoteSearchDriver',
+ 'mw.ClipEdit',
+ 'mw.style.ClipEdit',
+ '$j.fn.textSelection',
+ '$j.ui',
+ '$j.widget',
+ '$j.ui.mouse',
+ '$j.ui.sortable'
+ ], function() {
+ mw.load( mwEmbedHostPath +
'/remotes/AddMediaWizardEditPage.js?' + mwGetReqArgs() );
+ } );
+ },100);
return ;
}
}
@@ -565,7 +568,7 @@
||
// force load jquery if version 1.3.2 ( issues with
'1.3.2' .data handling )
jQuery.fn.jquery == '1.3.2')
- {
+ {
rurl += 'window.jQuery';
coma = ',';
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
