From 63de706b3aeb1ed35917b9b99440d91b14c3947a Mon Sep 17 00:00:00 2001 From: Michael Dale Date: Wed, 25 Nov 2009 20:15:44 +0000 Subject: [PATCH] * restored copy-by-url uploads in add-media-wizard per r59320 changes --- js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js | 6 +++--- js2/mwEmbed/libAddMedia/mvFirefogg.js | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js b/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js index c223a256ea..5dbb6c3c9a 100644 --- a/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js +++ b/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js @@ -492,8 +492,8 @@ mvBaseUploadInterface.prototype = { $j( '#up-status-container' ).html( gM( 'mwe-upload-stats-fileprogress', [ - $mw.lang.formatSize( data.upload['loaded'] ), - $mw.lang.formatSize( data.upload['content_length'] ) + mw.lang.formatSize( data.upload['loaded'] ), + mw.lang.formatSize( data.upload['content_length'] ) ] ) ); @@ -504,7 +504,7 @@ mvBaseUploadInterface.prototype = { $j( '#up-status-container' ).html( gM( 'mwe-upload-stats-fileprogress', [ - $mw.lang.formatSize( data.upload['loaded'] ), + mw.lang.formatSize( data.upload['loaded'] ), gM( 'mwe-upload-unknown-size' ) ] ) diff --git a/js2/mwEmbed/libAddMedia/mvFirefogg.js b/js2/mwEmbed/libAddMedia/mvFirefogg.js index aeb40a3b1f..1add58bbeb 100644 --- a/js2/mwEmbed/libAddMedia/mvFirefogg.js +++ b/js2/mwEmbed/libAddMedia/mvFirefogg.js @@ -819,6 +819,7 @@ mvFirefogg.prototype = { // extends mvBaseUploadInterface //_this.formData[ 'wpIgnoreWarning' ]='true'; _this.formData['wpSourceType'] = 'upload'; _this.formData['action'] = 'submit'; + // wpUploadFile is set by firefogg delete _this.formData['file']; -- 2.20.1