jenkins-bot has submitted this change and it was merged.
Change subject: kartogrpher.js: Rename and rescope some variables
......................................................................
kartogrpher.js: Rename and rescope some variables
Change-Id: I4251633fc7a6a4edcf6756cf8969ded11cf696e6
---
M modules/kartographer.js
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/kartographer.js b/modules/kartographer.js
index ead9f26..92cf5c0 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -30,23 +30,25 @@
mw.hook( 'wikipage.content' ).add( function ( $content ) {
- var scale, urlFmt, mapData, geoJson, dataLayer;
+ var scale, urlFormat, mapData;
scale = bracketDevicePixelRatio();
scale = ( scale === 1 ) ? '' : ( '@' + scale + 'x' );
- urlFmt = '/{z}/{x}/{y}' + scale + '.png';
+ urlFormat = '/{z}/{x}/{y}' + scale + '.png';
mapData = mw.config.get( 'wgKartographerLiveData' ) || {};
$content.find( '.mw-kartographer-live' ).each( function () {
- var $this = $( this ),
+ var dataLayer, geoJson,
+ $this = $( this ),
style = $this.data( 'style' ),
zoom = $this.data( 'zoom' ),
lat = $this.data( 'lat' ),
lon = $this.data( 'lon' ),
overlays = $this.data( 'overlays' ),
map = L.map( this ).setView( [ lat, lon ], zoom
);
+
map.attributionControl.setPrefix( '' );
- L.tileLayer( mapServer + '/' + style + urlFmt, {
+ L.tileLayer( mapServer + '/' + style + urlFormat, {
maxZoom: 18,
attribution: 'Wikimedia maps beta | Map data
© <a href="http://openstreetmap.org/copyright";>OpenStreetMap
contributors</a>'
} ).addTo( map );
--
To view, visit https://gerrit.wikimedia.org/r/262447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4251633fc7a6a4edcf6756cf8969ded11cf696e6
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[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
