Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/298453
Change subject: Move fullscreen map resize to the dialog
......................................................................
Move fullscreen map resize to the dialog
This functionality is not specific to the window manager.
Change-Id: Ifb685c027c90d4e2dd750459b2739118480ce4d0
---
M modules/fullscreen/MapDialog.js
M modules/kartographer.js
2 files changed, 14 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/53/298453/1
diff --git a/modules/fullscreen/MapDialog.js b/modules/fullscreen/MapDialog.js
index df6ac80..d2f9cfa 100644
--- a/modules/fullscreen/MapDialog.js
+++ b/modules/fullscreen/MapDialog.js
@@ -143,15 +143,15 @@
mw.kartographer.MapDialog.prototype.getReadyProcess = function ( data )
{
return
mw.kartographer.MapDialog.super.prototype.getReadyProcess.call( this, data )
.next( function () {
- var self = this;
+ var dialog = this;
this.MWMap.ready( function ( map, mapData ) {
var fullScreenState =
mapData.fullScreenState,
extendedData = {};
- self.map = map;
- self.mapData = mapData;
+ dialog.map = map;
+ dialog.mapData = mapData;
- map.addControl( new CloseControl( {
dialog: self } ) );
+ map.addControl( new CloseControl( {
dialog: dialog } ) );
if ( fullScreenState ) {
// override with full screen
state
@@ -160,9 +160,18 @@
}
if ( typeof mapData.maptagId ===
'number' ) {
- map.on( 'moveend',
self.onMapMove, self );
+ map.on( 'moveend',
dialog.onMapMove, dialog );
}
+ // Wait for dialog transition to
complete
+ setTimeout( function () {
+ // Check the map stil exists
+ if ( map ) {
+ map.invalidateSize();
+ console.log('inv');
+ }
+ }, 250 );
+
mw.hook( 'wikipage.maps' ).fire( map,
true /* isFullScreen */ );
} );
}, this );
diff --git a/modules/kartographer.js b/modules/kartographer.js
index 0dbb2cc..fa24af3 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -64,14 +64,6 @@
getWindowManager()
.openWindow( getMapDialog(), dialogData
)
.then( function ( opened ) {
- // It takes 250ms for the
dialog to open,
- // we'd better invalidate the
size once it opened.
- setTimeout( function () {
- var map =
getMapDialog().map;
- if ( map ) {
-
map.invalidateSize();
- }
- }, 300 );
return opened;
} )
.then( function ( closing ) {
--
To view, visit https://gerrit.wikimedia.org/r/298453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb685c027c90d4e2dd750459b2739118480ce4d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
