| Index: branches/new-upload/phase3/js2/mwEmbed/php/jsAutoloadLocalClasses.php |
| — | — | @@ -51,7 +51,7 @@ |
| 52 | 52 | |
| 53 | 53 | //libAddMedia: |
| 54 | 54 | $wgJSAutoloadLocalClasses['mvFirefogg'] = $wgMwEmbedDirectory . 'libAddMedia/mvFirefogg.js'; |
| 55 | | - $wgJSAutoloadLocalClasses['mvAdvFirefogg'] = $wgMwEmbedDirectory . 'libAddMedia/advFirefogg.js'; |
| | 55 | + $wgJSAutoloadLocalClasses['mvAdvFirefogg'] = $wgMwEmbedDirectory . 'libAddMedia/mvAdvFirefogg.js'; |
| 56 | 56 | $wgJSAutoloadLocalClasses['mvUploader'] = $wgMwEmbedDirectory . 'libAddMedia/mvUploader.js'; |
| 57 | 57 | $wgJSAutoloadLocalClasses['remoteSearchDriver'] = $wgMwEmbedDirectory . 'libAddMedia/remoteSearchDriver.js'; |
| 58 | 58 | $wgJSAutoloadLocalClasses['seqRemoteSearchDriver'] = $wgMwEmbedDirectory . 'libAddMedia/seqRemoteSearchDriver.js'; |
| Index: branches/new-upload/phase3/js2/mwEmbed/example_usage/Make_Ogg.html |
| — | — | @@ -4,11 +4,16 @@ |
| 5 | 5 | <title>Firefogg - Make Ogg Video in your Browser</title> |
| 6 | 6 | <script type="text/javascript" src="../jsScriptLoader.php?class=mv_embed"></script> |
| 7 | 7 | <style type="text/css" media="all">@import "http://www.firefogg.org/css/style.css";</style> |
| 8 | | - |
| | 8 | +<style type="text/css" media="all"> |
| | 9 | +.install{ |
| | 10 | +display:none; |
| | 11 | +} |
| | 12 | +</style> |
| 9 | 13 | <script type="text/javascript"> |
| 10 | 14 | mwAddOnloadHook(function(){ |
| | 15 | + $j('#check_install').hide(); |
| 11 | 16 | $j('.install').hide(); |
| 12 | | - if(!($j.browser.mozilla && $h.browser.version >= '1.9.1')) { |
| | 17 | + if(!($j.browser.mozilla && $j.browser.version >= '1.9.1')) { |
| 13 | 18 | $j('#use_firefox').show(); |
| 14 | 19 | }else { |
| 15 | 20 | if(typeof(Firefogg) != 'undefined' && Firefogg().version >= '0.9.5') { |
| — | — | @@ -61,7 +66,7 @@ |
| 62 | 67 | '$j.cookie' : 'jquery/jquery.ui-1.7.1/external/jquery.cookie.js', |
| 63 | 68 | '$j.ui' : 'jquery/jquery.ui-1.7.1/ui/ui.core.js', |
| 64 | 69 | '$j.ui.accordion' : 'jquery/jquery.ui-1.7.1/ui/ui.accordion.js', |
| 65 | | - '$j.ui.slider' : 'jquery/jquery.ui-1.7.1/ui/ui.slider.js'; |
| | 70 | + '$j.ui.slider' : 'jquery/jquery.ui-1.7.1/ui/ui.slider.js' |
| 66 | 71 | },function(){ |
| 67 | 72 | //do setupSettings: |
| 68 | 73 | //for all options see /* iniObj in mvAdvFirefogg.js */ |
| — | — | @@ -73,7 +78,7 @@ |
| 74 | 79 | //the control container (where we put all the controls) |
| 75 | 80 | 'control_container' : '#control_container' |
| 76 | 81 | }); |
| 77 | | - ); |
| | 82 | + }); |
| 78 | 83 | } |
| 79 | 84 | </script> |
| 80 | 85 | </head><body> |
| — | — | @@ -85,7 +90,8 @@ |
| 86 | 91 | <center> |
| 87 | 92 | <table width="500" border="0"> |
| 88 | 93 | <tr> |
| 89 | | -<td colspan="2"> |
| | 94 | +<td colspan="2" > |
| | 95 | + <div id="check_install"><center>Checking for Firefogg<blink>...</blink></center></div> |
| 90 | 96 | <div id="install_linux" class="install"> |
| 91 | 97 | <a href="linux/Firefogg-0.9.5.xpi">Install Firefogg</a> |
| 92 | 98 | </div> |
| Index: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvUploader.js |
| — | — | @@ -424,7 +424,8 @@ |
| 425 | 425 | 'action' : 'upload', |
| 426 | 426 | 'url' : $j('#wpUploadFileURL').val(), |
| 427 | 427 | 'filename' : $j('#wpDestFile').val(), |
| 428 | | - 'comment' : $j('#wpUploadDescription').val() |
| | 428 | + 'comment' : $j('#wpUploadDescription').val(), |
| | 429 | + 'asyncdownload': true |
| 429 | 430 | }, |
| 430 | 431 | 'url' : _this.api_url |
| 431 | 432 | }, function( data ){ |