jenkins-bot has submitted this change and it was merged.
Change subject: Use settings module instead of variable
......................................................................
Use settings module instead of variable
Update ZeroBanner to latest MFE convention of requiring
user settings as a module instead of as a variable
Change-Id: Icb469e11951be7423b4d554a9e6868a6b8e5bc9e
---
M modules/banner.js
M modules/interstitial.js
2 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/banner.js b/modules/banner.js
index c2545c2..43fd189 100644
--- a/modules/banner.js
+++ b/modules/banner.js
@@ -3,9 +3,9 @@
var m = ( function() {
function initBanner( banner ) {
var cookieNameZeroVisibility = banner.getAttribute(
'id' ),
- settings = M.settings,
- saveUserSetting = settings.saveUserSetting,
- getUserSetting = settings.getUserSetting,
+ settings = M.require('settings'),
+ saveUserSetting = settings.save,
+ getUserSetting = settings.get,
visibility,
dismissNotification =
banner.getElementsByTagName( 'button' )[ 0 ];
diff --git a/modules/interstitial.js b/modules/interstitial.js
index 93166e8..eeb3626 100644
--- a/modules/interstitial.js
+++ b/modules/interstitial.js
@@ -6,6 +6,7 @@
hostname = document.location.hostname.toLowerCase(), //
hostname of the current page
isMdot = hostname.indexOf( '.m.' ) !== -1,
isHttps = window.location.protocol === 'https:',
+ settings = M.require('settings'), // module for
reading/writing user settings
// this is set if operator zero-rates HTTPS
supportsTls = config ? config.enabled &&
config.enableHttps : $.cookie( 'ZeroOpts' ) === 'tls',
getConfig = config ? config : ( function () {
@@ -32,7 +33,7 @@
And if the user doesn't have cookies but does have JS, we'll
check
the config API as a last resort.
*/
- if ( supportsTls || M.settings.getUserSetting( 'zerodontask',
true ) ) {
+ if ( supportsTls || settings.get( 'zerodontask', true ) ) {
$( '.icon-watchlist,.icon-loginout,#page-actions'
).show();
$( '.hlist > li:not(.new)' ).css( 'display',
'inline-block' );
if ( !isMdot ) {
@@ -113,7 +114,7 @@
if ( config && !config.enabled ) {
// Config is provided but disabled, we don't
exist
showWarning = false;
- } else if ( M.settings.getUserSetting( 'zerodontask',
true ) ) {
+ } else if ( settings.get( 'zerodontask', true ) ) {
// User chooses not to be notified, no need for
any kinds of warnings
showWarning = false;
} else if ( isSpecialCase ) {
--
To view, visit https://gerrit.wikimedia.org/r/176061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb469e11951be7423b4d554a9e6868a6b8e5bc9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Jhobs <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
