wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-11-23 23:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove limited width cached HTML handling

Browse source 
Bug: T343843
Change-Id: Ib49e8325fddef90e202d4e753526af45ed7b2c26
This commit is contained in:
Jon Robson 2023-08-08 11:04:11 -07:00 committed by Jdlrobson
parent 72bac95cf9
commit 2ea12a11ef
7 changed files with 9 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
resources/skins.vector.js/features.js
View file

@ -13,17 +13,6 @@ function save( feature, enabled ) {
if ( !mw.user.isNamed() ) {
switch ( feature ) {
case 'limited-width':
// FIXME: Cookie is set for cached HTML using the older inline script.
// When removing this code,
// please retain `mw.cookie.set( 'mwclientprefs', null );` for 1-4 weeks
// to clean up after ourselves so users don't have a non-expiring cookie which
// serves no purpose.
if ( enabled ) {
mw.cookie.set( 'mwclientprefs', null );
} else {
mw.cookie.set( 'mwclientprefs', 'vector-feature-limited-width' );
}
// Save the setting under the new system
// @ts-ignore https://github.com/wikimedia/typescript-types/pull/44
mw.user.clientPrefs.set( `vector-feature-${feature}`, enabled ? '1' : '0' );

33
resources/skins.vector.js/limitedWidthToggle.js
View file

@ -34,38 +34,15 @@ function init() {
const settings = /** @type {HTMLElement|null} */ ( document.querySelector( '.vector-settings' ) );
const toggle = /** @type {HTMLElement|null} */ ( document.querySelector( '.vector-limited-width-toggle' ) );
const toggleIcon = /** @type {HTMLElement|null} */ ( document.querySelector( '.vector-limited-width-toggle .vector-icon' ) );
const cookie = mw.cookie.get( 'mwclientprefs' );
// @ts-ignore https://github.com/wikimedia/typescript-types/pull/42
const existingValue = mw.user.clientPrefs.get( 'vector-feature-limited-width' );
// On a cached page existingValue will return false.
// If the cookie is set then we need to add the appropriate class to the page
// so that the toggle works correctly.
if ( !existingValue ) {
document.documentElement.classList.add(
`vector-feature-limited-width-clientpref-${cookie ? '0' : '1'}`
);
document.documentElement.classList.remove(
'vector-feature-limited-width-disabled',
'vector-feature-limited-width-enabled'
);
}
// Sync cookie value with clientPrefs if the two are misaligned.
if ( cookie && existingValue === '1' ) {
// @ts-ignore https://github.com/wikimedia/typescript-types/pull/42
mw.user.clientPrefs.set( 'vector-feature-limited-width', '0' );
// Update the display.
document.documentElement.classList.remove(
'vector-feature-limited-width-clientpref-1',
'vector-feature-limited-width-enabled'
);
document.documentElement.classList.add(
'vector-feature-limited-width-clientpref-0'
);
}
if ( !settings || !toggle || !toggleIcon ) {
return;
}
// Remove any references to the old cookie.
// We retain this for longer than usual to make sure we remove this cookie from as
// many clients as possible.
// FIXME: This can be removed in November 2023.
mw.cookie.set( 'mwclientprefs', null );
setDataAttribute( toggle );

6
resources/skins.vector.styles/layouts/grid.less
View file

@ -60,12 +60,10 @@
}
}
}
// FIXME: Remove -disabled when cache has cleared.
&.vector-feature-limited-width-clientpref-0 .mw-content-container,
&.vector-feature-limited-width-clientpref-0 .mw-table-of-contents-container,
&.vector-feature-limited-width-disabled .mw-content-container,
&.vector-feature-limited-width-content-disabled .mw-content-container,
&.vector-feature-limited-width-disabled .mw-table-of-contents-container,
&.vector-feature-limited-width-content-disabled .mw-table-of-contents-container {
// Allow the max-width of content on history/special pages to be wider than
// the max-width of content on article pages.
@ -124,9 +122,7 @@
column-gap: @grid-column-gap;
}
// FIXME: Remove -disabled when cache has cleared.
&.vector-feature-limited-width-clientpref-0 .mw-body,
&.vector-feature-limited-width-disabled .mw-body,
&.vector-feature-limited-width-content-disabled .mw-body {
grid-template-columns: ~'minmax(0, 1fr) min-content';
}

4
resources/skins.vector.styles/layouts/preZebra.less
View file

@ -4,9 +4,7 @@
.mixin-page-container();
}
// FIXME: Remove -disabled when cache has cleared.
&.vector-feature-limited-width-clientpref-0 .vector-header-container,
&.vector-feature-limited-width-disabled .vector-header-container {
&.vector-feature-limited-width-clientpref-0 .vector-header-container {
max-width: none;
}

4
resources/skins.vector.styles/layouts/screen.less
View file

@ -129,9 +129,7 @@ body {
}
}
// FIXME: Remove -disabled when cache has cleared.
&.vector-feature-limited-width-clientpref-0 .mw-page-container,
&.vector-feature-limited-width-disabled .mw-page-container {
&.vector-feature-limited-width-clientpref-0 .mw-page-container {
max-width: none;
}

2
resources/skins.vector.zebra.styles/layouts/grid.less
View file

@ -115,9 +115,7 @@
column-gap: @grid-column-gap;
}
// FIXME: Remove -disabled when cache has cleared.
&.vector-feature-limited-width-clientpref-0 .mw-body,
&.vector-feature-limited-width-disabled .mw-body,
&.vector-feature-limited-width-content-disabled .mw-body {
grid-template-columns: ~'minmax(0, 1fr) min-content';
}

6
resources/skins.vector.zebra.styles/layouts/screen.less
View file

@ -183,13 +183,9 @@ body {
.mixin-vector-page-container-sizing();
}
// FIXME: Remove -disabled when cache has cleared.
&.vector-feature-limited-width-clientpref-0 .mw-page-container,
&.vector-feature-limited-width-clientpref-0 .vector-sticky-header,
&.vector-feature-limited-width-clientpref-0 .mw-header,
&.vector-feature-limited-width-disabled .mw-page-container,
&.vector-feature-limited-width-disabled .vector-sticky-header,
&.vector-feature-limited-width-disabled .mw-header {
&.vector-feature-limited-width-clientpref-0 .mw-header {
max-width: none;
}