JGirault has uploaded a new change for review. https://gerrit.wikimedia.org/r/279286
Change subject: [Alternative] Fix the map capturing the scroll and zooming. ...................................................................... [Alternative] Fix the map capturing the scroll and zooming. Alternative to: https://gerrit.wikimedia.org/r/#/c/279088/ https://gerrit.wikimedia.org/r/#/c/279285/ - Here we only enable scroll zoom on full screen, considering the distance from the cursor to the [+] and [-] zoom buttons is short when the map is simply embed on a wiki article. - Scroll zoom is totally disabled if the map is not full screen. Bug: T126659 Change-Id: I9712e24568f544edead3bb897c872c5924aacd47 --- M modules/kartographer.MapDialog.js M modules/kartographer.js 2 files changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/86/279286/1 diff --git a/modules/kartographer.MapDialog.js b/modules/kartographer.MapDialog.js index 7571a8d..08d5cf4 100644 --- a/modules/kartographer.MapDialog.js +++ b/modules/kartographer.MapDialog.js @@ -31,6 +31,7 @@ return mw.kartographer.MapDialog.super.prototype.getSetupProcess.call( this, data ) .next( function () { this.map = mw.kartographer.createMap( this.$map[ 0 ], data ); + this.map.scrollWheelZoom.enable(); }, this ); }; diff --git a/modules/kartographer.js b/modules/kartographer.js index 61219ed..ecda108 100644 --- a/modules/kartographer.js +++ b/modules/kartographer.js @@ -211,12 +211,7 @@ getWindowManager() .openWindow( mapDialog, data ) .then( function ( opened ) { return opened; } ) - .then( function ( closing ) { - if ( map ) { - map.setView( mapDialog.map.getCenter(), mapDialog.map.getZoom() ); - } - return closing; - } ); + .then( function ( closing ) { return closing; } ); } ); }; @@ -257,6 +252,7 @@ data.enableFullScreenButton = true; map = mw.kartographer.createMap( this, data ); + map.scrollWheelZoom.disable(); map.doubleClickZoom.disable(); $this.on( 'dblclick', function () { mw.kartographer.openFullscreenMap( data, map ); -- To view, visit https://gerrit.wikimedia.org/r/279286 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9712e24568f544edead3bb897c872c5924aacd47 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: master Gerrit-Owner: JGirault <jgira...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
