jenkins-bot has submitted this change and it was merged.
Change subject: Display edit icon and page actions
......................................................................
Display edit icon and page actions
According to Adam (on ticket) the hiding of these is an oversight
and no longer necessary.
This patch intentionally shows the edit icon and page actions.
Bug: T143425
Change-Id: Icacaf112e4c8c46b0f359cb2a482784c232dc3bd
---
M modules/interstitial.js
M modules/redux.less
2 files changed, 0 insertions(+), 55 deletions(-)
Approvals:
Thcipriani: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/interstitial.js b/modules/interstitial.js
index 2dc60ae..5494dc7 100644
--- a/modules/interstitial.js
+++ b/modules/interstitial.js
@@ -21,40 +21,6 @@
};
} )();
- $( '#page-secondary-actions' ).find( '.languageSelector'
).off();
-
- if ( isMdot ) {
- /* CSS isn't working for this element, and !important
breaks stuff */
- $( '.icon-settings' ).show();
- }
-
- /*
- In the future state with ESI, we may need to revisit approach.
- But for now, we'll have Varnish send a cookie.
- And if the user doesn't have cookies but does have JS, we'll
check
- the config API as a last resort.
- */
- if ( settings.get( 'zerodontask', true ) ) {
- $( '.icon-watchlist,.icon-loginout,#page-actions'
).show();
- $( '.hlist > li:not(.new)' ).css( 'display',
'inline-block' );
- if ( !isMdot ) {
- /* the previous display: inline-block needs a
tweak */
- $( '#ca-upload' ).hide();
- } else {
- /*
- FIXME: jdlrobson in change 83133 - "Maybe
MobileFrontend can make this
- easier by marking these links with a shared
class so you can do something
- like $( '.httpsLink' ).show();"
- */
- $( '.icon-uploads,#ca-upload' ).show();
- }
- // Theoretically, cookies could be turned off, but it's
unlikely.
- // We decided to avoid hitting the API in this case.
- } else {
- /* We should avoid !important for these */
- $( '.icon-uploads,.edit-page' ).hide();
- }
-
// Disable other click event handlers for images/thumbnails,
for example, the
// mobile media viewer.
// FIXME: Figure out a less fragile way to handle this
diff --git a/modules/redux.less b/modules/redux.less
index 81bc7d9..87155c4 100644
--- a/modules/redux.less
+++ b/modules/redux.less
@@ -6,24 +6,3 @@
.mw-mf-settings > ul:nth-child(2) > li:nth-child(4) {
display:none !important;
}
-
-/*
-Let's avoid !important where we can,
-or at least where we care to .show().
-jQuery's .show() retains the original
-display: <value> prior to .hide(),
-whereas it seems display:none !important
-means that it's necessary to manually
-revert the display: properties to
-turn them back on when using !important,
-per http://api.jquery.com/show/.
-*/
-.icon-settings,
-.icon-uploads,
-.icon-watchlist,
-.icon-loginout,
-.edit-page,
-#page-actions,
-#ca-upload {
- display:none;
-}
--
To view, visit https://gerrit.wikimedia.org/r/310601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icacaf112e4c8c46b0f359cb2a482784c232dc3bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: wmf/1.28.0-wmf.18
Gerrit-Owner: Jhobs <jhob...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
