jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357432 )
Change subject: Update for deprecation of OOjs UI openWindow/closeWindow promise
......................................................................
Update for deprecation of OOjs UI openWindow/closeWindow promise
Bug: T166729
Change-Id: If61f70171445967d5f5c040bf96d0099f6ba26b1
---
M modules/dialog/index.js
M modules/wikivoyage/wikivoyage.js
2 files changed, 48 insertions(+), 60 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dialog/index.js b/modules/dialog/index.js
index 037baa2..f91f92a 100644
--- a/modules/dialog/index.js
+++ b/modules/dialog/index.js
@@ -48,7 +48,8 @@
render: function ( map ) {
var window = getWindowManager(),
- dialog = getMapDialog();
+ dialog = getMapDialog(),
+ instance;
if ( map.useRouter && !routerEnabled ) {
router.on( 'route', closeIfNotMapRoute );
@@ -56,24 +57,18 @@
routerEnabled = true;
}
- if ( !window.opened ) {
- getWindowManager()
- .openWindow( dialog, { map: map } )
- .then( function ( opened ) {
- return opened;
- } )
- .then( function ( closing ) {
- if ( map.parentMap ) {
- map.parentMap.setView(
- map.getCenter(),
- map.getZoom()
- );
- }
- dialog.close();
- mapDialog = null;
- windowManager = null;
- return closing;
- } );
+ if ( !window.getCurrentWindow() ) {
+ instance = getWindowManager().openWindow(
dialog, { map: map } );
+ instance.closing.then( function () {
+ if ( map.parentMap ) {
+ map.parentMap.setView(
+ map.getCenter(),
+ map.getZoom()
+ );
+ }
+ mapDialog = null;
+ windowManager = null;
+ } );
} else if ( dialog.map !== map ) {
dialog.setup( { map: map } );
dialog.ready( { map: map } );
@@ -90,7 +85,7 @@
var window = getWindowManager(),
dialog = getMapDialog(),
- map;
+ map, instance;
function createAndRenderMap() {
mw.loader.using( 'ext.kartographer.box' ).then(
function () {
@@ -109,27 +104,23 @@
} );
}
- if ( window.opened ) {
+ if ( window.getCurrentWindow() ) {
createAndRenderMap();
} else {
- getWindowManager()
- .openWindow( dialog, {} )
- .then( function ( opened ) {
- createAndRenderMap();
- return opened;
- } )
- .then( function ( closing ) {
- if ( map.parentMap ) {
- map.parentMap.setView(
- map.getCenter(),
- map.getZoom()
- );
- }
- dialog.close();
- mapDialog = null;
- windowManager = null;
- return closing;
- } );
+ instance = getWindowManager().openWindow(
dialog, {} );
+ instance.opened.then( function () {
+ createAndRenderMap();
+ } );
+ instance.closing.then( function () {
+ if ( map.parentMap ) {
+ map.parentMap.setView(
+ map.getCenter(),
+ map.getZoom()
+ );
+ }
+ mapDialog = null;
+ windowManager = null;
+ } );
}
},
diff --git a/modules/wikivoyage/wikivoyage.js b/modules/wikivoyage/wikivoyage.js
index 1c64a44..a57c737 100644
--- a/modules/wikivoyage/wikivoyage.js
+++ b/modules/wikivoyage/wikivoyage.js
@@ -124,28 +124,25 @@
isFullScreen:
!!map.options.fullscreen,
feature: map
} );
- alertExternalData()
- .then( function ( opened ) {
- opened.then( function (
closing, data ) {
- if ( data &&
data.action && data.action === 'good' ) {
-
areExternalAllowed = true;
-
mw.storage.set( STORAGE_KEY, '1' );
-
mw.track( 'mediawiki.kartographer', {
-
action: 'wv-warn-agree',
-
isFullScreen: !!map.options.fullscreen,
-
feature: map
- } );
-
deferred.resolve();
- } else {
-
mw.track( 'mediawiki.kartographer', {
-
action: 'wv-warn-reject',
-
isFullScreen: !!map.options.fullscreen,
-
feature: map
- } );
-
deferred.reject();
- }
+ alertExternalData().closed.then(
function ( data ) {
+ if ( data && data.action &&
data.action === 'good' ) {
+ areExternalAllowed =
true;
+ mw.storage.set(
STORAGE_KEY, '1' );
+ mw.track(
'mediawiki.kartographer', {
+ action:
'wv-warn-agree',
+ isFullScreen:
!!map.options.fullscreen,
+ feature: map
} );
- } );
+ deferred.resolve();
+ } else {
+ mw.track(
'mediawiki.kartographer', {
+ action:
'wv-warn-reject',
+ isFullScreen:
!!map.options.fullscreen,
+ feature: map
+ } );
+ deferred.reject();
+ }
+ } );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/357432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If61f70171445967d5f5c040bf96d0099f6ba26b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: JGirault <jgira...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
