wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-27 04:06:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Prefer localStorage to store ve-beta-welcome-dialog"

Browse source
This commit is contained in:
jenkins-bot 2014-12-09 22:39:09 +00:00 committed by Gerrit Code Review
parent 2edf5a7104 51b091b9cd
commit ed22cbffea
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
View file

@ -1612,7 +1612,11 @@ ve.init.mw.ViewPageTarget.prototype.maybeShowDialogs = function () {
!urlSaysHide &&
(
prefSaysShow ||
( !usePrefs && $.cookie( 've-beta-welcome-dialog' ) === null )
(
!usePrefs &&
localStorage.getItem( 've-beta-welcome-dialog' ) === null &&
$.cookie( 've-beta-welcome-dialog' ) === null
)
)
) {
this.surface.getDialogs().openWindow( 'betaWelcome' );
@ -1629,7 +1633,11 @@ ve.init.mw.ViewPageTarget.prototype.maybeShowDialogs = function () {
// set the hidebetawelcome=1 preference, but only if this isn't a one-off
// view of the page via the hiding GET parameter.
} else if ( !usePrefs && !urlSaysHide ) {
$.cookie( 've-beta-welcome-dialog', 1, { path: '/', expires: 30 } );
try {
localStorage.setItem( 've-beta-welcome-dialog', 1 );
} catch ( e ) {
$.cookie( 've-beta-welcome-dialog', 1, { path: '/', expires: 30 } );
}
}
}