From 26ad78016f3a564ca2a32ff2b1239e8e48274eba Mon Sep 17 00:00:00 2001 From: Michael Dale Date: Thu, 1 Oct 2009 18:23:06 +0000 Subject: [PATCH] * don't display preview button on passthrough uploads (.tiff images etc) * updated msg text to not use title case * fixed bug where close dialog did not remove inner html from dom (videos continued to play) --- .../libAddMedia/mvBaseUploadInterface.js | 14 ++--- js2/mwEmbed/libAddMedia/mvFirefogg.js | 53 +++++++++++++++---- 2 files changed, 49 insertions(+), 18 deletions(-) diff --git a/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js b/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js index 89fb94daf4..2f129e4595 100644 --- a/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js +++ b/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js @@ -437,7 +437,7 @@ mvBaseUploadInterface.prototype = { var bObj = {}; bObj[ gM('mwe-return-to-form') ] = function(){ _this.form_post_override = false; - $j(this).dialog('close'); + $j(this).empty().dialog('close'); }; //@@TODO should be refactored to more specialUpload page type error handling @@ -571,7 +571,7 @@ mvBaseUploadInterface.prototype = { $j( _this.editForm ).submit(); }; bObj[ gM('mwe-return-to-form') ] = function(){ - $j(this).dialog('close'); + $j(this).empty().dialog('close'); _this.form_post_override = false; } _this.updateProgressWin( gM('mwe-uploadwarning'), '

' + gM('mwe-uploadwarning') + '

' +wmsg + '

',bObj); @@ -606,14 +606,14 @@ mvBaseUploadInterface.prototype = { if( _this.done_upload_cb && typeof _this.done_upload_cb == 'function'){ js_log("call done_upload_cb"); //close up shop: - $j('#upProgressDialog').dialog('close'); + $j('#upProgressDialog').empty().dialog('close'); //call the callback: _this.done_upload_cb( apiRes.upload ); return false; }else{ var bObj = {}; bObj[ gM('mwe-return-to-form')] = function(){ - $j(this).dialog('close'); + $j(this).empty().dialog('close'); _this.form_post_override = false; } bObj[ gM('mwe-go-to-resource') ] = function(){ @@ -638,10 +638,10 @@ mvBaseUploadInterface.prototype = { if(buttons){ $j('#upProgressDialog').dialog('option','buttons', buttons); }else{ - //@@todo should convice the jquery ui people to not use object keys as user msg's + //@@todo should fix jquery ui to not use object keys as user msg's var bObj = {}; bObj[ gM('mwe-ok-button') ] = function(){ - $j(this).dialog('close'); + $j(this).empty().dialog('close'); }; $j('#upProgressDialog').dialog('option','buttons', bObj); } @@ -718,7 +718,7 @@ mvBaseUploadInterface.prototype = { //confirm: if( confirm( gM('mwe-cancel-confim') )){ //@@todo (cancel the encode / upload) - $j(this).dialog('close'); + $j(this).empty().dialog('close'); return false; }else{ return true; diff --git a/js2/mwEmbed/libAddMedia/mvFirefogg.js b/js2/mwEmbed/libAddMedia/mvFirefogg.js index abbd24d1ff..c886c61004 100644 --- a/js2/mwEmbed/libAddMedia/mvFirefogg.js +++ b/js2/mwEmbed/libAddMedia/mvFirefogg.js @@ -16,8 +16,8 @@ loadGM({ "fogg-transcoding" : "Encoding video to Ogg", "fogg-encoding-done" : "Encoding complete", "fogg-badtoken" : "Token is not valid", - "fogg-preview" : "Preview Video", - "fogg-hidepreview" : "Hide Preview" + "fogg-preview" : "Preview video", + "fogg-hidepreview" : "Hide preview" }); var firefogg_install_links = { @@ -314,7 +314,10 @@ mvFirefogg.prototype = { //extends mvBaseUploadInterface //do firefogg specific additions: dispProgressOverlay:function(){ this.pe_dispProgressOverlay(); - this.doPreviewControl(); + //if we are uploading video (not in passthrough mode show preview button) + if( ! this.encoder_settings['passthrough'] ){ + this.doPreviewControl(); + } }, doPreviewControl:function(){ var _this = this; @@ -358,6 +361,8 @@ mvFirefogg.prototype = { //extends mvBaseUploadInterface $j('#fogg_preview_canvas').hide('slow'); } + //don't follow the # + return false; }); }, doRenderPreview:function(){ @@ -365,8 +370,7 @@ mvFirefogg.prototype = { //extends mvBaseUploadInterface //set up the hidden video to pull frames from: if( $j('#fogg_preview_vid').length == 0 ) $j('body').append(''); - var v = $j('#fogg_preview_vid').get(0); - + var v = $j('#fogg_preview_vid').get(0); function seekToEnd(){ var v = $j('#fogg_preview_vid').get(0); @@ -446,7 +450,7 @@ mvFirefogg.prototype = { //extends mvBaseUploadInterface _this.autoEncoderSettings(); //if set to passthough update the interface: - if(_this.encoder_settings['passthrough']==true){ + if(_this.encoder_settings['passthrough'] == true){ $j(_this.target_passthrough_mode).show(); }else{ $j(_this.target_passthrough_mode).hide(); @@ -676,11 +680,38 @@ mvFirefogg.prototype = { //extends mvBaseUploadInterface //update upload status: _this.doUploadStatus(); }else{ - js_log("done with encoding (no upload) "); + js_log("done with encoding (no upload) "); //set stuats to 100% for one second: - _this.updateProgress( 1 ); + _this.updateProgress( 1 ); setTimeout(function(){ - _this.updateProgressWin(gM('fogg-encoding-done'), gM('fogg-encoding-done')); + _this.updateProgressWin(gM('fogg-encoding-done'), + gM('fogg-encoding-done') + '
' + + //show the video at full resolution upto 720px wide + '' + ); + //load the video and set a callback: + var v = $j('#fogg_final_vid').get(0); + function resizeVid(){ + var v = $j('#fogg_final_vid').get(0); + if( v.videoWidth > 720 ){ + $j(v).css({ + 'width':720, + 'height': 720 * (v.videoHeight/v.videoWidth) + }); + }else{ + $j(v).css({ + 'width': v.videoWidth, + 'height': v.videoHeight + }); + } + } + + //set flag to diplay video at res + v.removeEventListener("loadedmetadata", resizeVid, true); + v.addEventListener("loadedmetadata", resizeVid, true); + v.load(); + }, 1000); } }, @@ -755,7 +786,7 @@ mvFirefogg.prototype = { //extends mvBaseUploadInterface }else{ //if done action returns 'false' //close progress window this.action_done = true; - $j('#upProgressDialog').dialog('close'); + $j('#upProgressDialog').empty().dialog('close'); } }else{ //update status (without done_upload_cb) @@ -786,7 +817,7 @@ mvFirefogg.prototype = { //extends mvBaseUploadInterface }else{ this.action_done = true; this.fogg.cancel(); - $j(dlElm).dialog('close'); + $j(dlElm).empty().dialog('close'); } } else{ return false; -- 2.20.1