http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89135
Revision: 89135
Author: hartman
Date: 2011-05-29 20:41:12 +0000 (Sun, 29 May 2011)
Log Message:
-----------
A few more global var leaks and a couple of config name typos that we should
squash, before it becomes very difficult.
Modified Paths:
--------------
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/iframeApi/mw.IFramePlayerApiServer.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php
2011-05-29 20:33:26 UTC (rev 89134)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/EmbedPlayer.config.php
2011-05-29 20:41:12 UTC (rev 89135)
@@ -98,17 +98,17 @@
'EmbedPlayer.MonitorRate' => 250,
// If the embedPlayer should accept arguments passed in
from iframe postMessages calls
- 'EmbedPlayer.EnalbeIFramePlayerServer' => false,
+ 'EmbedPlayer.EnableIFramePlayerServer' => false,
// If embedPlayer should support server side temporal
urls for seeking options are
// flash|always|none default is support for flash only.
'EmbedPlayer.EnableURLTimeEncoding' => 'flash',
// The domains which can read and send events to the
video player
- 'EmbedPLayer.IFramePlayer.DomainWhiteList' => '*',
+ 'EmbedPlayer.IFramePlayer.DomainWhiteList' => '*',
// If the iframe should send and receive javascript
events across domains via postMessage
'EmbedPlayer.EnableIframeApi' => true,
);
-?>
\ No newline at end of file
+?>
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/iframeApi/mw.IFramePlayerApiServer.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/iframeApi/mw.IFramePlayerApiServer.js
2011-05-29 20:33:26 UTC (rev 89134)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/iframeApi/mw.IFramePlayerApiServer.js
2011-05-29 20:41:12 UTC (rev 89135)
@@ -184,7 +184,7 @@
},
/**
- * Check an origin domain against the configuration value:
'EmbedPLayer.IFramePlayer.DomainWhiteList'
+ * Check an origin domain against the configuration value:
'EmbedPlayer.IFramePlayer.DomainWhiteList'
* Returns true if the origin domain is allowed to communicate with
the embedPlayer
* otherwise returns false.
*
@@ -192,9 +192,9 @@
* The origin domain to be checked
*/
'eventDomainCheck': function( origin ){
- if( mw.getConfig( 'EmbedPLayer.IFramePlayer.DomainWhiteList' )
){
+ if( mw.getConfig( 'EmbedPlayer.IFramePlayer.DomainWhiteList' )
){
// NOTE this is very similar to the apiProxy function:
- var domainWhiteList =
mw.getConfig('EmbedPLayer.IFramePlayer.DomainWhiteList');
+ var domainWhiteList =
mw.getConfig('EmbedPlayer.IFramePlayer.DomainWhiteList');
if( domainWhiteList == '*' ){
// The default very permissive state
return true;
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js
2011-05-29 20:33:26 UTC (rev 89134)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/mw.MediaElement.js
2011-05-29 20:41:12 UTC (rev 89135)
@@ -167,7 +167,8 @@
var _this = this;
// Select the default source
var playableSources = this.getPlayableSources();
- var flash_flag = ogg_flag = false;
+ var flash_flag, oggflag;
+ flash_flag = ogg_flag = false;
// Check if there are any playableSources
if( playableSources.length == 0 ){
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
2011-05-29 20:33:26 UTC (rev 89134)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
2011-05-29 20:41:12 UTC (rev 89135)
@@ -1009,7 +1009,7 @@
doVolumeBinding: function( ) {
var embedPlayer = this.embedPlayer;
var _this = this;
- $volumeSlider = embedPlayer.$interface.find( '.volume-slider' );
+ var $volumeSlider = embedPlayer.$interface.find(
'.volume-slider' );
if( $volumeSlider.length == 0 ){
return false;
}
@@ -1841,7 +1841,7 @@
'w' : 36,
'o' : function( ctrlObj ) {
mw.log( 'PlayerControlBuilder::Set up volume
control for: ' + ctrlObj.embedPlayer.id );
- $volumeOut = $( '<span />' );
+ var $volumeOut = $( '<span />' );
if ( ctrlObj.volume_layout == 'horizontal' ) {
$volumeOut.append(
$( '<div />' )
Modified:
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
===================================================================
---
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
2011-05-29 20:33:26 UTC (rev 89134)
+++
trunk/extensions/TimedMediaHandler/MwEmbedModules/TimedText/resources/mw.TimedText.js
2011-05-29 20:41:12 UTC (rev 89135)
@@ -217,7 +217,7 @@
return {
'w': 28,
'o': function( ctrlObj ) {
- $textButton = $( '<div />' )
+ var $textButton = $( '<div />' )
.attr( 'title', gM(
'mwe-embedplayer-timed_text' ) )
.addClass( "ui-state-default
ui-corner-all ui-icon_link rButton timed-text" )
.append(
@@ -531,7 +531,7 @@
}
},
/**
- * Enalbe a source and update the currentLangKey
+ * Enable a source and update the currentLangKey
* @param source
* @return
*/
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
