wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-12-01 01:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ve.ui.MWEducationPopupTool: Respect default preferences for anon users"

Browse source
This commit is contained in:
jenkins-bot 2019-12-13 16:23:24 +00:00 committed by Gerrit Code Review
parent bb94043f34 4086de5a9a
commit cee6e3e6a9
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
modules/ve-mw/ui/tools/ve.ui.MWEducationPopupTool.js
View file

@ -16,22 +16,25 @@
*/
ve.ui.MWEducationPopupTool = function VeUiMwEducationPopupTool( config ) {
var popupCloseButton, $popupContent, $shield,
usePrefs = !mw.user.isAnon(),
prefSaysShow = usePrefs && !mw.user.options.get( 'visualeditor-hideusered' ),
// For logged in users, only check their preferences, not local storage.
// For anon users, who can't change preferences, check local storage.
// (But also check preferences in case default values are overridden.)
checkLocalStorage = !!mw.user.isAnon(),
hiddenUsingPreferences = mw.user.options.get( 'visualeditor-hideusered' ),
hiddenUsingLocalStorage = mw.storage.get( 've-hideusered' ) || $.cookie( 've-hideusered' ),
tool = this;
config = config || {};
// Do not display on platforms other than desktop
if ( !( ve.init.mw.DesktopArticleTarget && ve.init.target instanceof ve.init.mw.DesktopArticleTarget ) ) {
return;
}
// Do not display if the user already acknowledged the popups
if (
!( ve.init.mw.DesktopArticleTarget && ve.init.target instanceof ve.init.mw.DesktopArticleTarget ) ||
(
!prefSaysShow &&
!(
!usePrefs &&
mw.storage.get( 've-hideusered' ) === null &&
$.cookie( 've-hideusered' ) === null
)
)
hiddenUsingPreferences ||
( hiddenUsingLocalStorage && checkLocalStorage )
) {
return;
}
@ -95,18 +98,19 @@ OO.initClass( ve.ui.MWEducationPopupTool );
* Click handler for the popup close button
*/
ve.ui.MWEducationPopupTool.prototype.onPopupCloseButtonClick = function () {
var usePrefs = !mw.user.isAnon(),
prefSaysShow = usePrefs && !mw.user.options.get( 'visualeditor-hideusered' );
var
canSavePreferences = !mw.user.isAnon(),
hiddenUsingPreferences = mw.user.options.get( 'visualeditor-hideusered' );
this.shownEducationPopup = true;
this.popup.toggle( false );
this.setActive( false );
ve.init.target.openEducationPopupTool = undefined;
if ( prefSaysShow ) {
if ( !hiddenUsingPreferences && canSavePreferences ) {
ve.init.target.getLocalApi().saveOption( 'visualeditor-hideusered', 1 );
mw.user.options.set( 'visualeditor-hideusered', 1 );
} else if ( !usePrefs ) {
} else if ( !canSavePreferences ) {
if ( !mw.storage.set( 've-hideusered', 1 ) ) {
$.cookie( 've-hideusered', 1, { path: '/', expires: 30 } );
}