Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262447
Change subject: kartogrpher.js: Code style fixes
......................................................................
kartogrpher.js: Code style fixes
So that is passes jshint and jscs.
Change-Id: I4251633fc7a6a4edcf6756cf8969ded11cf696e6
---
M modules/kartographer.js
1 file changed, 50 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/47/262447/1
diff --git a/modules/kartographer.js b/modules/kartographer.js
index 73b7967..af9282a 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -1,9 +1,11 @@
( function ( $, mw ) {
+ /* global L */
+
// Load this script after lib/mapbox-lib.js
- var mapServer = mw.config.get( 'wgKartographerMapServer'),
- forceHttps = mapServer[4] === 's',
+ var mapServer = mw.config.get( 'wgKartographerMapServer' ),
+ forceHttps = mapServer[ 4 ] === 's',
config = L.mapbox.config;
config.REQUIRE_ACCESS_TOKEN = false;
@@ -12,56 +14,65 @@
config.HTTPS_URL = !forceHttps ? false : mapServer;
function bracketDevicePixelRatio() {
- var brackets = mw.config.get( 'wgKartographerSrcsetScales' ),
+ var i, scale,
+ brackets = mw.config.get( 'wgKartographerSrcsetScales'
),
baseRatio = window.devicePixelRatio || 1;
- if (!brackets) return 1;
- brackets.unshift(1);
- for (var i = 0; i < brackets.length; i++) {
- var scale = brackets[i];
- if (scale >= baseRatio || (baseRatio - scale) < 0.1) {
+
+ if ( !brackets ) {
+ return 1;
+ }
+
+ brackets.unshift( 1 );
+ for ( i = 0; i < brackets.length; i++ ) {
+ scale = brackets[ i ];
+ if ( scale >= baseRatio || ( baseRatio - scale ) < 0.1
) {
return scale;
}
}
- return brackets[brackets.length - 1];
+ return brackets[ brackets.length - 1 ];
}
mw.hook( 'wikipage.content' ).add( function ( $content ) {
- var scale = bracketDevicePixelRatio();
- scale = (scale === 1) ? '' : ('@' + scale + 'x');
- var urlFmt = '/{z}/{x}/{y}' + scale + '.png';
- var mapData = mw.config.get( 'wgKartographerLiveData' ) || {};
+ var scale, urlFormat, mapData;
- $content.find('.mw-kartographer-live').each(function () {
- var $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, {
+ scale = bracketDevicePixelRatio();
+ scale = ( scale === 1 ) ? '' : ( '@' + scale + 'x' );
+ urlFormat = '/{z}/{x}/{y}' + scale + '.png';
+ mapData = mw.config.get( 'wgKartographerLiveData' ) || {};
+
+ $content.find( '.mw-kartographer-live' ).each( function () {
+ 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 + urlFormat, {
maxZoom: 18,
- attribution: 'Wikimedia maps beta | Map data
© <a href="http://openstreetmap.org/copyright";>OpenStreetMap
contributors</a>',
- }).addTo(map);
+ attribution: 'Wikimedia maps beta | Map data
© <a href="http://openstreetmap.org/copyright";>OpenStreetMap
contributors</a>'
+ } ).addTo( map );
- if (overlays) {
- var geoJson = [];
- $.each(overlays, function(_, group) {
- if (group === '*') {
- $.each(mapData, function (k, d)
{
- if (k[0] !== '_') {
- geoJson =
geoJson.concat(d);
+ if ( overlays ) {
+ geoJson = [];
+ $.each( overlays, function ( _, group ) {
+ if ( group === '*' ) {
+ $.each( mapData, function ( k,
d ) {
+ if ( k[ 0 ] !== '_' ) {
+ geoJson =
geoJson.concat( d );
}
- });
- } else if
(mapData.hasOwnProperty(group)) {
- geoJson =
geoJson.concat(mapData[group]);
+ } );
+ } else if ( mapData.hasOwnProperty(
group ) ) {
+ geoJson = geoJson.concat(
mapData[ group ] );
}
- });
- var dataLayer =
L.mapbox.featureLayer().addTo(map);
- dataLayer.setGeoJSON(geoJson);
+ } );
+ dataLayer = L.mapbox.featureLayer().addTo( map
);
+ dataLayer.setGeoJSON( geoJson );
}
- });
+ } );
} );
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/262447
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4251633fc7a6a4edcf6756cf8969ded11cf696e6
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
