jenkins-bot has submitted this change and it was merged.
Change subject: Regression: Fix file uploads
......................................................................
Regression: Fix file uploads
The change introduced in Iadb4ee2b336e07ae2dfec7f09798ba210f409f6b
prevents uploads from having format=json set. This rectifies that.
Change-Id: I5ac0f7aa26f28841ad1a2c1a9cca07d0e5f8a2c0
---
M javascripts/common/api.js
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/common/api.js b/javascripts/common/api.js
index 739d262..8518411 100644
--- a/javascripts/common/api.js
+++ b/javascripts/common/api.js
@@ -39,13 +39,13 @@
* @return {jQuery.Deferred} Object returned by $.ajax()
*/
ajax: function( data, options ) {
- var key, request, self = this;
+ var key, request, self = this, isFormData;
options = $.extend( { url: apiUrl, dataType: 'json' },
options );
+ isFormData = typeof FormData !== 'undefined' && data
instanceof FormData;
- if (
- typeof data !== 'string' &&
- ( typeof FormData === 'undefined' || !(
data instanceof FormData ) )
- ) {
+ if ( isFormData ) {
+ data.append( 'format', 'json' );
+ } else if ( typeof data !== 'string' ) {
for ( key in data ) {
if ( data[key] === false ) {
delete data[key];
@@ -53,8 +53,9 @@
data[key] = data[key].join( '|'
);
}
}
+ data = $.extend( { format: 'json' }, data );
}
- options.data = $.extend( { format: 'json' }, data );
+ options.data = data;
options.xhr = function() {
var xhr = $.ajaxSettings.xhr();
--
To view, visit https://gerrit.wikimedia.org/r/99551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ac0f7aa26f28841ad1a2c1a9cca07d0e5f8a2c0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
