r66202 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r66201‎ | r66202 | r66203 >
Date:17:01, 11 May 2010
Author:dale
Status:deferred
Tags:
Comment:
* added a check for empty moduleNames
* minor fix for embedPlayer interface updates
Modified paths:
  • /branches/MwEmbedStandAlone/includes/jsClassLoader.php (modified) (history)
  • /branches/MwEmbedStandAlone/loader.js (modified) (history)
  • /branches/MwEmbedStandAlone/modules/EmbedPlayer/kplayerEmbed.js (modified) (history)
  • /branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/ctrlBuilder.js (modified) (history)

Diff [purge]

Index: branches/MwEmbedStandAlone/loader.js
@@ -25,6 +25,7 @@
2626
2727 /**
2828 * The default set of enabled modules
 29+* ( Modules can also be enabled via mediaWiki extensions )
2930 *
3031 * Each enabledModules array value should be a name
3132 * of a folder in mwEmbed/modules
Index: branches/MwEmbedStandAlone/includes/jsClassLoader.php
@@ -211,6 +211,10 @@
212212 $mwEmbedAbsolutePath = ( $wgMwEmbedDirectory == '' )? $IP: $IP .'/' .$wgMwEmbedDirectory;
213213
214214 foreach( $moduleSet as $na => $moduleName ){
 215+ // Skip empty module names
 216+ if(trim( $moduleName ) == '' ){
 217+ continue;
 218+ }
215219 $moduleName = str_replace( array( '../', '\'', '"'), '', trim( $moduleName ));
216220 // Check if there is there are module loader files
217221 if( is_file( $mwEmbedAbsolutePath . '/modules/' . $moduleName . '/loader.js' )){
Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/kplayerEmbed.js
@@ -254,6 +254,7 @@
255255 * function called by flash applet when download bytes changes
256256 */
257257 onBytesDownloadedChange: function( data, id){
 258+ mw.log( 'onBytesDownloadedChange');
258259 this.bytesLoaded = data.newValue;
259260 this.bufferedPercent = this.bytesLoaded / this.bytesTotal;
260261
Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/skins/ctrlBuilder.js
@@ -852,7 +852,7 @@
853853 */
854854 setStatus: function( value ) {
855855 // update status:
856 - this.embedPlayer.$interface.find( '.time-disp' ).html( value );
 856+ this.embedPlayer.$interface.find( '.time-disp' ).text( value );
857857 },
858858
859859 /**

Status & tagging log