jenkins-bot has submitted this change and it was merged.
Change subject: WV: Make sure mw.storage is loaded before using it
......................................................................
WV: Make sure mw.storage is loaded before using it
Bug: T148865
Change-Id: I6b943f1b5ac4f50164d4e556193379459e83ea4a
---
M modules/wikivoyage/wikivoyage.js
1 file changed, 21 insertions(+), 18 deletions(-)
Approvals:
Yurik: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/wikivoyage/wikivoyage.js b/modules/wikivoyage/wikivoyage.js
index a73b4e6..106d2ce 100644
--- a/modules/wikivoyage/wikivoyage.js
+++ b/modules/wikivoyage/wikivoyage.js
@@ -111,26 +111,29 @@
isAllowed: function ( layer ) {
var deferred = $.Deferred();
- if ( areExternalAllowed === undefined ) {
- areExternalAllowed = mw.storage.get(
STORAGE_KEY ) === '1';
- }
+ mw.loader.using( 'mediawiki.storage' ).then( function
() {
- if ( !layer.options.wvIsExternal || areExternalAllowed
) {
- deferred.resolve();
- } else {
- alertExternalData()
- .then( function ( opened ) {
- opened.then( function (
closing, data ) {
- if ( data &&
data.action && data.action === 'good' ) {
-
areExternalAllowed = true;
- mw.storage.set(
STORAGE_KEY, '1' );
-
deferred.resolve();
- } else {
-
deferred.reject();
- }
+ if ( areExternalAllowed === undefined ) {
+ areExternalAllowed = mw.storage.get(
STORAGE_KEY ) === '1';
+ }
+
+ if ( !layer.options.wvIsExternal ||
areExternalAllowed ) {
+ deferred.resolve();
+ } else {
+ alertExternalData()
+ .then( function ( opened ) {
+ opened.then( function (
closing, data ) {
+ if ( data &&
data.action && data.action === 'good' ) {
+
areExternalAllowed = true;
+
mw.storage.set( STORAGE_KEY, '1' );
+
deferred.resolve();
+ } else {
+
deferred.reject();
+ }
+ } );
} );
- } );
- }
+ }
+ } );
return deferred.promise();
}
--
To view, visit https://gerrit.wikimedia.org/r/317198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b943f1b5ac4f50164d4e556193379459e83ea4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: JGirault <[email protected]>
Gerrit-Reviewer: JGirault <[email protected]>
Gerrit-Reviewer: MaxSem <[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
