| Index: branches/new-upload/phase3/js2/uploadPage.js |
| — | — | @@ -9,6 +9,10 @@ |
| 10 | 10 | var mwUploadHelper = { |
| 11 | 11 | init:function(){ |
| 12 | 12 | var _this = this; |
| | 13 | + //if not boolean false set to true: |
| | 14 | + if(typeof wgEnableFirefogg == 'undefined') |
| | 15 | + wgEnableFirefogg = true; |
| | 16 | + |
| 13 | 17 | if( wgEnableFirefogg ){ |
| 14 | 18 | //setup the upload handler to firefogg (supports our upload proccess) (should work with the http uploads too) |
| 15 | 19 | $j('#wpUploadFile').firefogg({ |
| Index: branches/new-upload/phase3/js2/mwEmbed/skins/mvpcf/styles.css |
| — | — | @@ -686,6 +686,11 @@ |
| 687 | 687 | background-image: url('images/pbar-ani.gif'); |
| 688 | 688 | } |
| 689 | 689 | |
| | 690 | +ui-widget-overlay{ |
| | 691 | + background: url("images/ui-bg_diagonals-thick_20_666666_40x40.png") repeat scroll 50% 50% #666666; |
| | 692 | + opacity:0.5; |
| | 693 | +} |
| | 694 | + |
| 690 | 695 | /* Vertical Tabs |
| 691 | 696 | ----------------------------------*/ |
| 692 | 697 | .ui-dialog-buttonpane { padding:10px !important; } |
| — | — | @@ -748,3 +753,4 @@ |
| 749 | 754 | -webkit-border-radius: 3px; |
| 750 | 755 | } |
| 751 | 756 | |
| | 757 | + |
| Index: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js |
| — | — | @@ -320,14 +320,15 @@ |
| 321 | 321 | js_log(" should update: " + _this.target_input_file_name + ' to: ' + _this.fogg.sourceFilename ); |
| 322 | 322 | $j(_this.target_input_file_name).val(_this.fogg.sourceFilename).show(); |
| 323 | 323 | |
| 324 | | - if(_this.new_source_cb){ |
| | 324 | + if(_this.new_source_cb){ |
| 325 | 325 | var oggExt = (_this.isSourceAudio())?'oga':'ogg'; |
| 326 | 326 | oggExt = (_this.isSourceVideo())?'ogv':oggExt; |
| | 327 | + oggExt = (_this.isUnknown())?'ogg':oggExt; |
| 327 | 328 | oggName = _this.fogg.sourceFilename.substr(0, |
| 328 | 329 | _this.fogg.sourceFilename.lastIndexOf('.')); |
| 329 | 330 | |
| 330 | 331 | _this.new_source_cb( _this.fogg.sourceFilename , oggName +'.'+ oggExt); |
| 331 | | - } |
| | 332 | + } |
| 332 | 333 | } |
| 333 | 334 | }else{ |
| 334 | 335 | //js_error("Firefogg error selecting file"); |
| — | — | @@ -368,14 +369,18 @@ |
| 369 | 370 | |
| 370 | 371 | js_log('base autoEncoderSettings::' + _this.sourceFileInfo.contentType + ' passthrough:' + _this.encoder_settings['passthrough']); |
| 371 | 372 | }, |
| | 373 | + isUnknown:function(){ |
| | 374 | + return (this.sourceFileInfo.contentType.indexOf("unknown") != -1); |
| | 375 | + }, |
| 372 | 376 | isSourceAudio:function(){ |
| 373 | 377 | return (this.sourceFileInfo.contentType.indexOf("audio/") != -1); |
| 374 | 378 | }, |
| 375 | 379 | isSourceVideo:function(){ |
| 376 | 380 | return (this.sourceFileInfo.contentType.indexOf("video/") != -1); |
| 377 | | - }, |
| | 381 | + }, |
| 378 | 382 | isOggFormat:function(){ |
| 379 | | - return ( this.sourceFileInfo.contentType.indexOf("video/ogg") != -1); |
| | 383 | + return ( this.sourceFileInfo.contentType.indexOf("video/ogg") != -1 || |
| | 384 | + this.sourceFileInfo.contentType.indexOf("application/ogg") != -1 ); |
| 380 | 385 | }, |
| 381 | 386 | getProgressTitle:function(){ |
| 382 | 387 | js_log("fogg:getProgressTitle f:" + this.fogg_enabled + ' rw:' + this.form_rewrite); |
| Index: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/remoteSearchDriver.js |
| — | — | @@ -1512,7 +1512,7 @@ |
| 1513 | 1513 | //update if its video or audio: |
| 1514 | 1514 | if( rObj.mime.indexOf('audio')!=-1 || |
| 1515 | 1515 | rObj.mime.indexOf('video')!=-1 || |
| 1516 | | - rObj.mime.indexOf('/ogg')){ |
| | 1516 | + rObj.mime.indexOf('/ogg') !=-1){ |
| 1517 | 1517 | mvJsLoader.embedVideoCheck(function(){ |
| 1518 | 1518 | mv_video_embed(); |
| 1519 | 1519 | }); |