| Index: trunk/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js |
| — | — | @@ -645,7 +645,7 @@ |
| 646 | 646 | var encodingStatus = function() { |
| 647 | 647 | var status = _this.fogg.status(); |
| 648 | 648 | |
| 649 | | - if( _this.show_preview == true ){ |
| | 649 | + if( _this.show_preview == true && _this.fogg.state == 'encoding'){ |
| 650 | 650 | _this.doRenderPreview(); |
| 651 | 651 | } |
| 652 | 652 | |
| — | — | @@ -709,26 +709,18 @@ |
| 710 | 710 | 'height': vH |
| 711 | 711 | }); |
| 712 | 712 | //if large video resize the dialog box: |
| 713 | | - if( vW > 400){ |
| | 713 | + if( vW + 5 > 400){ |
| 714 | 714 | //also resize the dialog box |
| 715 | | - $j('#upProgressDialog').parent().animate({ |
| 716 | | - 'width': vW + 5, |
| 717 | | - 'height' : vH + 30 |
| 718 | | - }); |
| | 715 | + $j('#upProgressDialog').dialog('option', 'width', vW + 20); |
| | 716 | + $j('#upProgressDialog').dialog('option', 'height', vH + 120); |
| 719 | 717 | |
| 720 | | - //also position the parent container |
| 721 | | - $j('#upProgressDialog').parent().animate({ |
| 722 | | - 'left': ($j(document).width() - (vW + 5) )/2 , |
| 723 | | - 'top': ($j(document).height() - (vH + 30) )/2 |
| 724 | | - }); |
| | 718 | + //also position the dialog container |
| | 719 | + $j('#upProgressDialog').dialog('option', 'position', 'center'); |
| 725 | 720 | } |
| 726 | | - } |
| 727 | | - |
| 728 | | - //set flag to diplay video at res |
| | 721 | + } |
| 729 | 722 | v.removeEventListener("loadedmetadata", resizeVid, true); |
| 730 | 723 | v.addEventListener("loadedmetadata", resizeVid, true); |
| 731 | | - v.load(); |
| 732 | | - |
| | 724 | + v.load(); |
| 733 | 725 | }, 1000); |
| 734 | 726 | } |
| 735 | 727 | }, |
| — | — | @@ -835,6 +827,7 @@ |
| 836 | 828 | this.action_done = true; |
| 837 | 829 | this.fogg.cancel(); |
| 838 | 830 | $j(dlElm).empty().dialog('close'); |
| | 831 | + return false; |
| 839 | 832 | } |
| 840 | 833 | } else{ |
| 841 | 834 | return false; |