From b3fe8d9965a5729808b1fbb3af568c8aa8988a82 Mon Sep 17 00:00:00 2001 From: Michael Dale Date: Tue, 25 Aug 2009 16:49:27 +0000 Subject: [PATCH] * updates for Add Media Wizard inline upload support * updated language-key mappings --- .../kPlayer_Simple_Video_Tag.html | 35 ----------- js2/mwEmbed/libAddMedia/remoteSearchDriver.js | 43 ++++++-------- js2/mwEmbed/libAddMedia/simpleUploadForm.js | 59 ++++++++++--------- js2/mwEmbed/libEmbedVideo/nativeEmbed.js | 6 +- js2/mwEmbed/mv_embed.js | 4 +- js2/mwEmbed/php/script-cache/README | 4 +- js2/mwEmbed/skins/ctrlBuilder.js | 22 +++---- js2/mwEmbed/skins/mvpcf/styles.css | 54 +++++++++++++++++ 8 files changed, 120 insertions(+), 107 deletions(-) delete mode 100644 js2/mwEmbed/example_usage/kPlayer_Simple_Video_Tag.html diff --git a/js2/mwEmbed/example_usage/kPlayer_Simple_Video_Tag.html b/js2/mwEmbed/example_usage/kPlayer_Simple_Video_Tag.html deleted file mode 100644 index 4dca7a6322..0000000000 --- a/js2/mwEmbed/example_usage/kPlayer_Simple_Video_Tag.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - Simple Video Tag Usage - - - - -

Simple Video Tag Usage

-once you include: mv_embed.js on any remote page you can then use the video tag like so: - -
-
- - - - -
Sample Embed
- Simple video Embed: - 
<video style="width:400px;height:288px" poster="http://metavid.org/w/index.php?action=ajax&rs=mv_frame_server&stream_id=71&t=1:23:16&size=400x300" 
-src="http://metavidstorage01.ucsc.edu/media/house_proceeding_07-18-06_00.ogg?t=1:23:16/1:23:44"></video>
-
-













  - - - diff --git a/js2/mwEmbed/libAddMedia/remoteSearchDriver.js b/js2/mwEmbed/libAddMedia/remoteSearchDriver.js index 37f5428756..0c6d3225aa 100644 --- a/js2/mwEmbed/libAddMedia/remoteSearchDriver.js +++ b/js2/mwEmbed/libAddMedia/remoteSearchDriver.js @@ -607,9 +607,9 @@ remoteSearchDriver.prototype = { //load this_wiki search system to grab the rObj _this.loadSearchLib(cp, function(){ //do basic layout form on left upload "bin" on right - $j('#tab-upload').html('' + + $j('#tab-upload').html('
' + '' + - '
' + + '' + '

' + gM('mwe-upload_a_file') + '

' + '
' + mv_get_loading_img() + @@ -639,19 +639,16 @@ remoteSearchDriver.prototype = { $j('#upload_form').simpleUploadForm({ "api_target" : _this.upload_api_target , "ondone_cb" : function( resultData ){ - var wTitle = resultData['wpDestFile']; + var wTitle = resultData['wpDestFile']; //add a loading div - $j( _this.target_container ).append('
' + - mv_get_loading_img('position:absolute;top:30px;left:30px') + - '
'); - cp.sObj.addByTitle( wTitle, function( rObj ){ - $j( _this.target_container ).find('#temp_edit_loader').remove(); - //redraw (with added result if new) - _this.drawOutputResults(); - //pull up recource editor: - _this.resourceEdit( rObj, $j('#res_upload_' + rObj.id).get(0) ); - }); + _this.addResourceEditLoader(); + + cp.sObj.addByTitle( wTitle, function( rObj ){ + //redraw (with added result if new) + _this.drawOutputResults(); + //pull up recource editor: + _this.resourceEdit( rObj, $j('#res_upload__' + rObj.id).get(0) ); + }); //return false to close progress window: return false; } @@ -1012,7 +1009,7 @@ remoteSearchDriver.prototype = { o+='
'; }else if(_this.result_display_mode == 'list'){ o+='
'; - o+=''; @@ -1456,14 +1453,13 @@ remoteSearchDriver.prototype = { myUp = new mvBaseUploadInterface({ 'api_url' : _this.local_wiki_api_url, 'done_upload_cb':function(){ - //we have finished the upload: - - //close up the rsd_resource_import - $j('#rsd_resource_import').remove(); - //run the parent callback: - cir_callback(); - //return false to avoid BaseUploadInterface done actions - return false; + js_log('doImportAPI:: run callback::' ); + //we have finished the upload: + + //close up the rsd_resource_import + $j('#rsd_resource_import').remove(); + //return the parent callback: + return cir_callback(); } }); //set the edit token if we have it handy @@ -1577,7 +1573,6 @@ remoteSearchDriver.prototype = { $j('#rsd_resource_import').remove(); }); } - } ); } diff --git a/js2/mwEmbed/libAddMedia/simpleUploadForm.js b/js2/mwEmbed/libAddMedia/simpleUploadForm.js index 1239689b4b..6a00a0e1c4 100644 --- a/js2/mwEmbed/libAddMedia/simpleUploadForm.js +++ b/js2/mwEmbed/libAddMedia/simpleUploadForm.js @@ -46,32 +46,33 @@ var default_form_options = { } //build an upload form: - var o = ''+ - '
' + - //hidden input: - ''+ - ''+ - '' + - - //form name set: - '
'+ - '
' + - - '
'+ - '
'+ - - '
' + - '