[MediaWiki-commits] [Gerrit] Treat grade-C browsers like JavaScript-less browsers - change (mediawiki...UploadWizard)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/277939

Change subject: Treat grade-C browsers like JavaScript-less browsers
......................................................................

Treat grade-C browsers like JavaScript-less browsers

Also, hide the loading spinner for them all.

Bug: T130167
Change-Id: I9d69ebb3d9ea993f1e4ee872e6588c4ccd2cfecd
---
M UploadWizard.php
M includes/specials/SpecialUploadWizard.php
A resources/uploadWizard.noWizard.css
3 files changed, 14 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/39/277939/1

diff --git a/UploadWizard.php b/UploadWizard.php
index 8d2bfe6..9b49f90 100644
--- a/UploadWizard.php
+++ b/UploadWizard.php
@@ -134,6 +134,10 @@
        'dependencies' => 'ext.uploadWizard'
 ) + $uploadWizardModuleInfo;
 
+$wgResourceModules['ext.uploadWizard.page.styles'] = array(
+       'styles' => 'uploadWizard.noWizard.css',
+) + $uploadWizardModuleInfo;
+
 $wgResourceModules['ext.uploadWizard.uploadCampaign.display'] = array(
        'styles' => 'ext.uploadWizard.uploadCampaign.display.css',
        'position' => 'top',
diff --git a/includes/specials/SpecialUploadWizard.php 
b/includes/specials/SpecialUploadWizard.php
index a9d480c..f53acce 100644
--- a/includes/specials/SpecialUploadWizard.php
+++ b/includes/specials/SpecialUploadWizard.php
@@ -107,16 +107,17 @@
                $out = $this->getOutput();
 
                // fallback for non-JS
-               $out->addHTML( '<noscript>' );
+               $out->addHTML( '<div class="mwe-upwiz-unavailable">' );
                $out->addHTML( '<p class="errorbox">' . $this->msg( 
'mwe-upwiz-js-off' )->escaped() . '</p>' );
                $this->simpleForm->show();
-               $out->addHTML( '</noscript>' );
+               $out->addHTML( '</div>' );
 
                // global javascript variables
                $this->addJsVars( $subPage );
 
                // dependencies (css, js)
                $out->addModules( 'ext.uploadWizard.page' );
+               $out->addModuleStyles( 'ext.uploadWizard.page.styles' );
 
                // where the uploadwizard will go
                // TODO import more from UploadWizard's createInterface call.
diff --git a/resources/uploadWizard.noWizard.css 
b/resources/uploadWizard.noWizard.css
new file mode 100644
index 0000000..8615917
--- /dev/null
+++ b/resources/uploadWizard.noWizard.css
@@ -0,0 +1,7 @@
+.client-js .mwe-upwiz-unavailable {
+       display: none;
+}
+
+.client-nojs #upload-wizard {
+       display: none;
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d69ebb3d9ea993f1e4ee872e6588c4ccd2cfecd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits