| Index: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js |
| — | — | @@ -447,7 +447,7 @@ |
| 448 | 448 | if( _this.formData['wpIgnoreWarning'] ) |
| 449 | 449 | aReq['ignorewarnings'] = _this.formData['wpIgnoreWarning']; |
| 450 | 450 | |
| 451 | | - js_log('do fogg upload call: '+ _this.api_url + ' :: ' + JSON.stringify( aReq ) ); |
| | 451 | + js_log('do fogg upload/encode call: '+ _this.api_url + ' :: ' + JSON.stringify( aReq ) ); |
| 452 | 452 | js_log('foggEncode: '+ JSON.stringify( _this.encoder_settings ) ); |
| 453 | 453 | _this.fogg.upload( JSON.stringify( _this.encoder_settings ), _this.api_url , JSON.stringify( aReq ) ); |
| 454 | 454 | |
| — | — | @@ -488,8 +488,8 @@ |
| 489 | 489 | var _this = this; |
| 490 | 490 | js_log('::encodeDone::'); |
| 491 | 491 | //send to the post url: |
| 492 | | - if( _this.form_rewrite ){ |
| 493 | | - js_log('done with encoding do upload:' + _this.editForm.action); |
| | 492 | + if( _this.form_rewrite && _this.upload_mode == 'post' ){ |
| | 493 | + js_log('done with encoding do POST upload:' + _this.editForm.action); |
| 494 | 494 | // ignore warnings & set source type |
| 495 | 495 | //_this.formData[ 'wpIgnoreWarning' ]='true'; |
| 496 | 496 | _this.formData[ 'wpSourceType' ] = 'file'; |
| — | — | @@ -499,6 +499,7 @@ |
| 500 | 500 | //update upload status: |
| 501 | 501 | _this.doUploadStatus(); |
| 502 | 502 | }else{ |
| | 503 | + js_log("done with encoding (no upload) ") |
| 503 | 504 | _this.updateProgressWin(gM('fogg-encoding-done'), gM('fogg-encoding-done')); |
| 504 | 505 | } |
| 505 | 506 | }, |
| — | — | @@ -533,7 +534,9 @@ |
| 534 | 535 | setTimeout(uploadStatus, 100); |
| 535 | 536 | } |
| 536 | 537 | //check upload state |
| 537 | | - else if( _this.fogg.state == 'upload done' || _this.fogg.state == 'done' ) { |
| | 538 | + else if( _this.fogg.state == 'upload done' || |
| | 539 | + _this.fogg.state == 'done' || |
| | 540 | + _this.fogg.state == 'encoding done' ) { |
| 538 | 541 | js_log( 'firefogg:upload done: '); |
| 539 | 542 | //if in "post" upload mode read the html response (should be depricated): |
| 540 | 543 | if( _this.upload_mode == 'post' && _this.api_url ) { |
| Index: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js |
| — | — | @@ -510,10 +510,8 @@ |
| 511 | 511 | width:400, |
| 512 | 512 | heigh:200, |
| 513 | 513 | beforeclose: function(event, ui) { |
| 514 | | - if( event.button==0 ){ |
| 515 | | - if( confirm( gM('mv-canecl-confim') )){ |
| 516 | | - _this.cancel_action(); |
| 517 | | - } |
| | 514 | + if( event.button==0 ){ |
| | 515 | + _this.cancel_action(); |
| 518 | 516 | }else{ |
| 519 | 517 | //click on button (dont do close action); |
| 520 | 518 | return true; |