http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65457
Revision: 65457
Author: dale
Date: 2010-04-22 22:45:02 +0000 (Thu, 22 Apr 2010)
Log Message:
-----------
debug statements cleanup
Modified Paths:
--------------
branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/loader.js
branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/skins/ctrlBuilder.js
branches/js2-work/phase3/js/mwEmbed/mwEmbed.js
branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js
Modified: branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/loader.js
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/loader.js
2010-04-22 22:44:01 UTC (rev 65456)
+++ branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/loader.js
2010-04-22 22:45:02 UTC (rev 65457)
@@ -13,7 +13,7 @@
// 'off' Does not display the timed text interface
"textInterface" : "auto",
- // If the player controls should be overlayed on top of the video ( if
supported by playback method)
+ // If the player controls should be overlaid on top of the video ( if
supported by playback method)
// can be set to false per embed player via overlayControls attribute
'overlayControls' : true,
Modified:
branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/skins/ctrlBuilder.js
===================================================================
---
branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/skins/ctrlBuilder.js
2010-04-22 22:44:01 UTC (rev 65456)
+++
branches/js2-work/phase3/js/mwEmbed/modules/EmbedPlayer/skins/ctrlBuilder.js
2010-04-22 22:45:02 UTC (rev 65457)
@@ -525,8 +525,7 @@
} );
// Add a special absolute overlay for hover ( to keep
menu displayed
$interface.hover(
- function(){
- mw.log("CALL HOVER");
+ function(){
// Show controls with a set timeout (
avoid fade in fade out on short mouse over )
setTimeout( function() {
if( mouseIn ){
Modified: branches/js2-work/phase3/js/mwEmbed/mwEmbed.js
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/mwEmbed.js 2010-04-22 22:44:01 UTC
(rev 65456)
+++ branches/js2-work/phase3/js/mwEmbed/mwEmbed.js 2010-04-22 22:45:02 UTC
(rev 65457)
@@ -787,11 +787,10 @@
// Issue the request to load the class (include class
name in result callback:
mw.getScript( scriptRequest, function( scriptRequest ) {
-
// If its a "syle sheet" manually set its class
to true
- var ext = scriptRequest.substr(
scriptRequest.lastIndexOf( '.' ), 4 ).toLowerCase();
+ var ext = scriptRequest.substr(
scriptRequest.split('?')[0].lastIndexOf( '.' ), 4 ).toLowerCase();
if( ext == '.css' && className.substr(0,8)
== 'mw.style' ){
- window [ className ] = true;
+ mw.style[ className.substr( 8 ) ] =
true;
}
// Debug output
Modified: branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js
===================================================================
--- branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js 2010-04-22
22:44:01 UTC (rev 65456)
+++ branches/js2-work/phase3/js/mwEmbed/remotes/mediaWiki.js 2010-04-22
22:45:02 UTC (rev 65457)
@@ -347,12 +347,12 @@
* @param {callback} function callback to be called once mwEmbed is ready
*/
function loadMwEmbed( classSet, callback ) {
- if( typeof classSet == 'function')
+ if( typeof classSet == 'function') {
callback = classSet;
-
+ }
// Inject mwEmbed if needed
if ( typeof MW_EMBED_VERSION == 'undefined' ) {
- if ( ( mwReqParam['uselang'] || mwReqParam[ 'useloader' ] ) &&
mwUseScriptLoader ) {
+ if ( mwUseScriptLoader ) {
var rurl = mwEmbedHostPath +
'/mwEmbed/jsScriptLoader.php?class=';
var coma = '';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
