jenkins-bot has submitted this change and it was merged.
Change subject: Use latest settings API. No longer depend on MobileFrontend
......................................................................
Use latest settings API. No longer depend on MobileFrontend
\o/ upstreaming
Bug: T109352
Change-Id: I812e7ee28a6eb1b0f4eaacd8544ed71173fdb37f
---
M extension.json
M resources/ext.gather.init/init.js
2 files changed, 5 insertions(+), 6 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index e2edbaf..2717901 100644
--- a/extension.json
+++ b/extension.json
@@ -285,7 +285,7 @@
"mobile.user",
"ext.gather.api",
"ext.gather.collection.base",
- "mobile.settings",
+ "mediawiki.storage",
"skins.minerva.icons.variants.js",
"ext.gather.watchstar.icons",
"ext.gather.buttonspinner"
diff --git a/resources/ext.gather.init/init.js
b/resources/ext.gather.init/init.js
index 272ddff..afe0099 100644
--- a/resources/ext.gather.init/init.js
+++ b/resources/ext.gather.init/init.js
@@ -9,7 +9,6 @@
PageActionOverlay = M.require(
'mobile.contentOverlays/PointerOverlay' ),
WatchstarPageActionOverlay = M.require(
'ext.gather.watchstar/WatchstarPageActionOverlay' ),
Tag = M.require( 'ext.gather.watchstar/Tag' ),
- settings = M.require( 'mobile.settings/settings' ),
settingOverlayWasDismissed = 'gather-has-dismissed-tutorial',
mainMenuPointerDismissed = 'gather-has-dismissed-mainmenu',
user = M.require( 'mobile.user/user' ),
@@ -42,7 +41,7 @@
// Don't show if the overlay is open as user could have
clicked watchstar
!$( 'html' ).hasClass( 'gather-overlay-enabled' ) &&
// Tutorial has never been dismissed
- !settings.get( settingOverlayWasDismissed ) &&
+ !mw.storage.get( settingOverlayWasDismissed ) &&
// Feature flag is enabled
mw.config.get( 'wgGatherShouldShowTutorial' )
) {
@@ -57,7 +56,7 @@
* @ignore
*/
function overlayDismissed() {
- settings.save( settingOverlayWasDismissed, true );
+ mw.storage.set( settingOverlayWasDismissed, true );
}
/**
@@ -98,11 +97,11 @@
* @ignore
*/
function revealCollectionsInMainMenu() {
- if ( !settings.get( mainMenuPointerDismissed ) ) {
+ if ( !mw.storage.get( mainMenuPointerDismissed ) ) {
mainMenu.advertiseNewFeature( '.collection-menu-item',
mw.msg( 'gather-main-menu-new-feature' ), skin
).done( function ( pointerOverlay ) {
pointerOverlay.on( 'hide', function () {
- settings.save(
mainMenuPointerDismissed, true );
+ mw.storage.set(
mainMenuPointerDismissed, true );
} );
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/247533
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I812e7ee28a6eb1b0f4eaacd8544ed71173fdb37f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: dev
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jhernandez <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
