https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113734
Revision: 113734
Author: dale
Date: 2012-03-13 17:28:26 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
fixes MediaWikiPlayerSupport bindings
updated binding event name to newEmbedPlayerEvent
fixed case on getShareIframeSrc event name
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.processEmbedPlayers.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
trunk/extensions/TimedMediaHandler/resources/mw.MediaWikiPlayerSupport.js
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
2012-03-13 17:05:04 UTC (rev 113733)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.loader.js
2012-03-13 17:28:26 UTC (rev 113734)
@@ -2,7 +2,6 @@
* EmbedPlayer loader
*/
( function( mw, $ ) {
-
/**
* Add a DOM ready check for player tags
*
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
2012-03-13 17:05:04 UTC (rev 113733)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js
2012-03-13 17:28:26 UTC (rev 113734)
@@ -1539,7 +1539,7 @@
var iframeUrl = false;
$( this ).trigger( 'getShareIframeSrc', function(
localIframeSrc ){
if( iframeUrl){
- mw.log("Error multiple modules binding
getShareIframeSrc" );
+ mw.log("EmbedPlayer:: Error multiple modules
binding getShareIframeSrc" );
}
iframeUrl = localIframeSrc;
});
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.processEmbedPlayers.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.processEmbedPlayers.js
2012-03-13 17:05:04 UTC (rev 113733)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.processEmbedPlayers.js
2012-03-13 17:28:26 UTC (rev 113734)
@@ -87,7 +87,7 @@
mw.log("EmbedPlayer::EmbedPlayerNewPlayer:trigger " +
inDomPlayer.id );
// Allow plugins to add bindings to the inDomPlayer
- $( mw ).trigger ( 'EmbedPlayerNewPlayer', inDomPlayer );
+ $( mw ).trigger ( 'newEmbedPlayerEvent', inDomPlayer );
// Add a player ready binding:
$( inDomPlayer ).bind( 'playerReady',
areSelectedPlayersReady );
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
2012-03-13 17:05:04 UTC (rev 113733)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
2012-03-13 17:28:26 UTC (rev 113734)
@@ -1760,7 +1760,7 @@
var _this = this;
var embedPlayer = this.embedPlayer;
// for each source with "native playback"
- $sourceMenu = $('<ul />');
+ var $sourceMenu = $('<ul />');
// Local function to closure the "source" variable scope:
function addToSourceMenu( source ){
Modified: trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
===================================================================
--- trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2012-03-13 17:05:04 UTC (rev 113733)
+++ trunk/extensions/TimedMediaHandler/TimedMediaHandler.hooks.php
2012-03-13 17:28:26 UTC (rev 113734)
@@ -65,6 +65,7 @@
'scripts' =>
'resources/mw.MediaWikiPlayerSupport.js',
'dependencies'=> array( 'mw.Api' )
) ),
+ // adds support MediaWikiPlayerSupport player bindings
"mw.MediaWikiPlayer.loader" => array_merge(
$baseExtensionResource, array(
'loaderScripts' =>
'resources/mw.MediaWikiPlayer.loader.js',
) ),
Modified:
trunk/extensions/TimedMediaHandler/resources/mw.MediaWikiPlayerSupport.js
===================================================================
--- trunk/extensions/TimedMediaHandler/resources/mw.MediaWikiPlayerSupport.js
2012-03-13 17:05:04 UTC (rev 113733)
+++ trunk/extensions/TimedMediaHandler/resources/mw.MediaWikiPlayerSupport.js
2012-03-13 17:28:26 UTC (rev 113734)
@@ -243,13 +243,11 @@
callback();
}
});
-
- $( embedPlayer ).bind( 'GetShareIframeSrc', function(event,
callback){
+ $( embedPlayer ).bind( 'getShareIframeSrc', function(event,
callback){
// Check the embedPlayer title key:
var title = $( embedPlayer).attr( 'data-mwtitle');
// TODO Check the provider key and use that hosts title
page entry point!
var provider = $( embedPlayer).attr(
'data-mwprovider');
-
var iframeUrl = false;
if( mw.getConfig('wgServer') &&
mw.getConfig('wgArticlePath') ){
iframeUrl = mw.getConfig('wgServer') +
@@ -257,6 +255,7 @@
unescape(
embedPlayer.apiTitleKey ).replace( /^(File:|Image:)/ , '' ) ) +
'?' + 'embedplayer=yes';
}
+
callback( iframeUrl );
});
};
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
