awjrichards has submitted this change and it was merged.

Change subject: Send all upload request parameters inside FormData
......................................................................


Send all upload request parameters inside FormData

There is no reason for concatenating some of them as a querystring.

Change-Id: Ifacbaa89f80a25a9cd7fada96fe7e9ee7da1d05b
---
M javascripts/modules/mf-photo.js
1 file changed, 6 insertions(+), 2 deletions(-)

Approvals:
  awjrichards: Verified; Looks good to me, approved



diff --git a/javascripts/modules/mf-photo.js b/javascripts/modules/mf-photo.js
index a86de73..edb2e29 100644
--- a/javascripts/modules/mf-photo.js
+++ b/javascripts/modules/mf-photo.js
@@ -83,6 +83,11 @@
                                var formData = new FormData();
                                options.fileName = generateFileName( 
options.file, options.pageTitle );
 
+                               formData.append( 'action', 'upload' );
+                               formData.append( 'format', 'json' );
+                               // send useformat=mobile for sites where 
endpoint is a desktop url so that they are mobile edit tagged
+                               formData.append( 'useformat', 'mobile' );
+                               formData.append( 'origin', M.getOrigin() );
                                formData.append( 'filename', options.fileName );
                                formData.append( 'comment', mw.msg( 
options.editSummaryMessage ) );
                                formData.append( 'file', options.file );
@@ -94,8 +99,7 @@
 
                                self.post( formData, {
                                        // iOS seems to ignore the cache 
parameter so sending r parameter
-                                       // send useformat=mobile for sites 
where endpoint is a desktop url so that they are mobile edit tagged
-                                       url: apiUrl + 
'?action=upload&format=json&useformat=mobile&r=' + Math.random() + '&origin=' + 
M.getOrigin(),
+                                       url: apiUrl + '?r=' + Math.random(),
                                        xhrFields: { 'withCredentials': true },
                                        cache: false,
                                        contentType: false,

-- 
To view, visit https://gerrit.wikimedia.org/r/50274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifacbaa89f80a25a9cd7fada96fe7e9ee7da1d05b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: awjrichards <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to