jenkins-bot has submitted this change and it was merged. Change subject: Make flickr import use postWithToken instead of iframe transport ......................................................................
Make flickr import use postWithToken instead of iframe transport Change-Id: Ib521edd1b4fda77294ef34b04388625817316da5 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/960 Bug: 65423 --- M UploadWizard.php M UploadWizardHooks.php A resources/mw.ApiUploadPostHandler.js M resources/mw.UploadWizardUpload.js 4 files changed, 42 insertions(+), 1 deletion(-) Approvals: MarkTraceur: Looks good to me, but someone else must approve Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/UploadWizard.php b/UploadWizard.php index 881e9b3..3552ab4 100644 --- a/UploadWizard.php +++ b/UploadWizard.php @@ -111,6 +111,11 @@ 'messages' => 'mwe-upwiz-transport-started', ) + $uploadWizardModuleInfo; +$wgResourceModules['ext.uploadWizard.apiUploadPostHandler'] = array( + 'scripts' => 'mw.ApiUploadPostHandler.js', + 'messages' => 'mwe-upwiz-transport-started', +) + $uploadWizardModuleInfo; + //upload using FormData, large files in chunks $wgResourceModules['ext.uploadWizard.apiUploadFormDataHandler'] = array( 'scripts' => 'mw.ApiUploadFormDataHandler.js', diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php index c6cbc3e..42cba49 100644 --- a/UploadWizardHooks.php +++ b/UploadWizardHooks.php @@ -42,6 +42,7 @@ 'mediawiki.feedback', 'uw.base', 'ext.uploadWizard.apiUploadHandler', + 'ext.uploadWizard.apiUploadPostHandler', 'ext.uploadWizard.apiUploadFormDataHandler', 'ext.uploadWizard.events', diff --git a/resources/mw.ApiUploadPostHandler.js b/resources/mw.ApiUploadPostHandler.js new file mode 100644 index 0000000..9a605d2 --- /dev/null +++ b/resources/mw.ApiUploadPostHandler.js @@ -0,0 +1,35 @@ +( function ( mw ) { + /** + * Represents an object which send a direct request to the MediaWiki API. + * This is used when there is no actual file payload (eg. Flickr import) + * @param {mw.UploadWizardUpload} upload current upload + * @param {mw.Api} api + */ + mw.ApiUploadPostHandler = function ( upload, api ) { + this.upload = upload; + this.api = api; + }; + + mw.ApiUploadPostHandler.prototype = { + start: function () { + var handler = this; + + this.beginTime = ( new Date() ).getTime(); + this.upload.ui.setStatus( 'mwe-upwiz-transport-started' ); + + this.api.postWithToken( 'edit', { + action: 'upload', + stash: 1, + ignorewarnings: 1, + url: this.upload.providedFile.url, + filename: this.beginTime.toString() + this.upload.filename + } ) + .fail( function ( code, result ) { + handler.upload.setError( result.error.code, result.error.info ); + } ) + .done( function ( result ) { + handler.upload.setTransported( result ); + } ); + } + }; +}( mediaWiki ) ); diff --git a/resources/mw.UploadWizardUpload.js b/resources/mw.UploadWizardUpload.js index 5da5b1f..7835da7 100644 --- a/resources/mw.UploadWizardUpload.js +++ b/resources/mw.UploadWizardUpload.js @@ -846,7 +846,7 @@ mw.log( 'mw.UploadWizard::getUploadHandler> ' + constructor ); } if ( this.fromURL ) { - constructor = 'ApiUploadHandler'; + constructor = 'ApiUploadPostHandler'; } this.uploadHandler = new mw[constructor]( this, this.api ); } -- To view, visit https://gerrit.wikimedia.org/r/168556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib521edd1b4fda77294ef34b04388625817316da5 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Gilles <[email protected]> Gerrit-Reviewer: Gergő Tisza <[email protected]> Gerrit-Reviewer: Gilles <[email protected]> Gerrit-Reviewer: MarkTraceur <[email protected]> Gerrit-Reviewer: Rillke <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
