Revision: 52583
Author: dale
Date: 2009-06-29 21:39:56 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
include remoteSearchDriver in callback for application based invocation
Modified Paths:
--------------
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
branches/new-upload/phase3/js2/mwEmbed/mv_embed.js
Modified:
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
2009-06-29 21:38:06 UTC (rev 52582)
+++ branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js
2009-06-29 21:39:56 UTC (rev 52583)
@@ -340,7 +340,7 @@
//set up the target invocation:
if( $j(this.target_invocation).length==0 ){
- js_log("RemoteSearchDriver:: no target invocation
provided")
+ js_log("RemoteSearchDriver:: no target invocation
provided (will have to run your own doInitDisplay() )");
}else{
$j(this.target_invocation).css('cursor','pointer').attr('title',
gM('add_media_wizard')).click(function(){
_this.doInitDisplay();
Modified: branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
2009-06-29 21:38:06 UTC (rev 52582)
+++ branches/new-upload/phase3/js2/mwEmbed/libEmbedVideo/embedVideo.js
2009-06-29 21:39:56 UTC (rev 52583)
@@ -2404,10 +2404,8 @@
this.default_players['video/h264'] = ['flash', 'vlc'];
this.default_players['video/ogg'] = ['native','vlc','java',
'generic'];
- this.default_players['application/ogg'] =
['native','vlc','java', 'generic'];
-
- this.default_players['audio/ogg'] = ['native','vlc', 'omtk',
'java' ];
-
+ this.default_players['application/ogg'] =
['native','vlc','java', 'generic'];
+ this.default_players['audio/ogg'] = ['native','vlc', 'java',
'omtk' ];
this.default_players['video/mp4'] = ['vlc'];
this.default_players['text/html'] = ['html'];
Modified: branches/new-upload/phase3/js2/mwEmbed/mv_embed.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/mv_embed.js 2009-06-29 21:38:06 UTC
(rev 52582)
+++ branches/new-upload/phase3/js2/mwEmbed/mv_embed.js 2009-06-29 21:39:56 UTC
(rev 52583)
@@ -112,10 +112,12 @@
path = '';
if(gClasses.length){
//do array loop:
- for(var i=0;i<gClasses.length;i++){
- //setup normal replacement of j with jquery
- var jsName = ( gClasses[i].substr(0,3) == '$j.' ) ?
opt['j_replace'] + gClasses[i].substr(3) : gClasses[i];
- mvClassPaths[ gClasses[i] ] = path + jsName + '.js';
+ for(var i=0; i<gClasses.length; i++){
+ if(typeof gClasses[i] != 'undefined'){
+ //setup normal replacement of j with jquery
+ var jsName = ( gClasses[i].substr(0,3) == '$j.'
) ? opt['j_replace'] + gClasses[i].substr(3) : gClasses[i];
+ mvClassPaths[ gClasses[i] ] = path + jsName +
'.js';
+ }
}
}else{
//do object loop:
@@ -773,8 +775,9 @@
], function(){
iObj['instance_name']= 'rsdMVRS';
_global['rsdMVRS'] = new
remoteSearchDriver( iObj );
- if( callback )
- callback();
+ if( callback ){
+ callback( _global['rsdMVRS'] );
+ }
});
});
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
