Revision: 52039
Author: dale
Date: 2009-06-17 10:08:11 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
fixed double cancel button for firefogg
Modified Paths:
--------------
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
Modified:
branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
2009-06-17 10:04:17 UTC (rev 52038)
+++ branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
2009-06-17 10:08:11 UTC (rev 52039)
@@ -510,10 +510,8 @@
width:400,
heigh:200,
beforeclose: function(event, ui) {
- if( event.button==0 ){
- if( confirm( gM('mv-canecl-confim') )){
- _this.cancel_action();
- }
+ if( event.button==0 ){
+ _this.cancel_action();
}else{
//click on button (dont do close action);
return true;
Modified: branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
===================================================================
--- branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
2009-06-17 10:04:17 UTC (rev 52038)
+++ branches/new-upload/phase3/js2/mwEmbed/libAddMedia/mvFirefogg.js
2009-06-17 10:08:11 UTC (rev 52039)
@@ -447,7 +447,7 @@
if( _this.formData['wpIgnoreWarning'] )
aReq['ignorewarnings'] =
_this.formData['wpIgnoreWarning'];
- js_log('do fogg upload call: '+ _this.api_url + ' :: ' +
JSON.stringify( aReq ) );
+ js_log('do fogg upload/encode call: '+ _this.api_url + ' :: ' +
JSON.stringify( aReq ) );
js_log('foggEncode: '+ JSON.stringify( _this.encoder_settings )
);
_this.fogg.upload( JSON.stringify( _this.encoder_settings ),
_this.api_url , JSON.stringify( aReq ) );
@@ -488,8 +488,8 @@
var _this = this;
js_log('::encodeDone::');
//send to the post url:
- if( _this.form_rewrite ){
- js_log('done with encoding do upload:' +
_this.editForm.action);
+ if( _this.form_rewrite && _this.upload_mode == 'post' ){
+ js_log('done with encoding do POST upload:' +
_this.editForm.action);
// ignore warnings & set source type
//_this.formData[ 'wpIgnoreWarning' ]='true';
_this.formData[ 'wpSourceType' ] = 'file';
@@ -499,6 +499,7 @@
//update upload status:
_this.doUploadStatus();
}else{
+ js_log("done with encoding (no upload) ")
_this.updateProgressWin(gM('fogg-encoding-done'),
gM('fogg-encoding-done'));
}
},
@@ -533,7 +534,9 @@
setTimeout(uploadStatus, 100);
}
//check upload state
- else if( _this.fogg.state == 'upload done' ||
_this.fogg.state == 'done' ) {
+ else if( _this.fogg.state == 'upload done' ||
+ _this.fogg.state == 'done' ||
+ _this.fogg.state == 'encoding
done' ) {
js_log( 'firefogg:upload done: ');
//if in "post" upload mode read the html
response (should be depricated):
if( _this.upload_mode == 'post' &&
_this.api_url ) {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
