jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Cleanup the progress bar FIXME
......................................................................
Hygiene: Cleanup the progress bar FIXME
The bug is fixed so do what the README says.
However bug 41731 isn't
Use a config variable rather than commenting out - much cleaner
and there is no reason this shouldn't be available to 3rd party wikis
Change-Id: Ie3805af2faf67d4e4e01a0b97ed618477d8adb41
---
M MobileFrontend.php
M includes/skins/SkinMinerva.php
M javascripts/common/api.js
3 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MobileFrontend.php b/MobileFrontend.php
index 85daf9d..9630f62 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -408,3 +408,10 @@
* Prefixed names of pages that will never display mobile view
*/
$wgMFNoMobilePages = array();
+
+/**
+ * Temporary boolean variable to enable/disable progress bars in the photo
uploader
+ * FIXME: This should be set to true by default (see bug 41731)
+ * @var bool
+ */
+$wgMFAjaxUploadProgressSupport = false;
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 7bfe1bd..f409465 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -199,6 +199,7 @@
global $wgMFLeadPhotoUploadCssSelector,
$wgMFEnableCssAnimations,
$wgMFUseCentralAuthToken,
$wgMFDeviceWidthTablet,
+ $wgMFAjaxUploadProgressSupport,
$wgMFAnonymousEditing, $wgMFEnablePhotoUploadCTA,
$wgMFPhotoUploadEndpoint, $wgMFPhotoUploadAppendToDesc;
@@ -208,6 +209,7 @@
$vars = array(
'wgMFUseCentralAuthToken' => $wgMFUseCentralAuthToken,
+ 'wgMFAjaxUploadProgressSupport' =>
$wgMFAjaxUploadProgressSupport,
'wgMFAnonymousEditing' => $wgMFAnonymousEditing,
'wgMFEnablePhotoUploadCTA' => $wgMFEnablePhotoUploadCTA,
'wgMFPhotoUploadAppendToDesc' =>
$wgMFPhotoUploadAppendToDesc,
diff --git a/javascripts/common/api.js b/javascripts/common/api.js
index 91eb6fc..83119f6 100644
--- a/javascripts/common/api.js
+++ b/javascripts/common/api.js
@@ -48,7 +48,7 @@
* @return {jQuery.Deferred} Object returned by $.ajax()
*/
ajax: function( data, options ) {
- var key, request;
+ var key, request, self = this;
options = $.extend( {}, options );
if (
@@ -65,11 +65,9 @@
}
options.data = data;
- // FIXME: uncomment when
https://bugzilla.wikimedia.org/show_bug.cgi?id=44921 is resolved
- /*
options.xhr = function() {
var xhr = $.ajaxSettings.xhr();
- if ( xhr.upload ) {
+ if ( xhr.upload && ( mw.config.get(
'wgMFAjaxUploadProgressSupport' ) ) ) {
// need to bind this event before we
open the connection (see note at
//
https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest/Using_XMLHttpRequest#Monitoring_progress)
xhr.upload.addEventListener(
'progress', function( ev ) {
@@ -80,7 +78,6 @@
}
return xhr;
};
- */
request = $.ajax( options );
this.requests.push( request );
--
To view, visit https://gerrit.wikimedia.org/r/89105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3805af2faf67d4e4e01a0b97ed618477d8adb41
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
