Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/262585
Change subject: build: Re-enable the 'requireSpacesInsideParentheses' rule for
jscs
......................................................................
build: Re-enable the 'requireSpacesInsideParentheses' rule for jscs
Change-Id: Ic3f6f22c47f98116e516749a7d952fd78513175e
---
M .jscsrc
M modules/kartographer.js
2 files changed, 30 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/85/262585/1
diff --git a/.jscsrc b/.jscsrc
index ab67111..1959eea 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,7 +1,6 @@
{
"preset": "wikimedia",
- "requireSpacesInsideParentheses": false,
"jsDoc": {
"checkAnnotations": {
"preset": "jsduck5",
diff --git a/modules/kartographer.js b/modules/kartographer.js
index 5c0cde2..ead9f26 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -2,7 +2,7 @@
// Load this script after lib/mapbox-lib.js
- var mapServer = mw.config.get( 'wgKartographerMapServer'),
+ var mapServer = mw.config.get( 'wgKartographerMapServer' ),
forceHttps = mapServer[ 4 ] === 's',
config = L.mapbox.config;
@@ -15,13 +15,13 @@
var i, scale,
brackets = mw.config.get( 'wgKartographerSrcsetScales'
),
baseRatio = window.devicePixelRatio || 1;
- if (!brackets) {
+ if ( !brackets ) {
return 1;
}
- brackets.unshift(1);
- for (i = 0; i < brackets.length; i++) {
+ brackets.unshift( 1 );
+ for ( i = 0; i < brackets.length; i++ ) {
scale = brackets[ i ];
- if (scale >= baseRatio || (baseRatio - scale) < 0.1) {
+ if ( scale >= baseRatio || ( baseRatio - scale ) < 0.1
) {
return scale;
}
}
@@ -33,40 +33,40 @@
var scale, urlFmt, mapData, geoJson, dataLayer;
scale = bracketDevicePixelRatio();
- scale = (scale === 1) ? '' : ('@' + scale + 'x');
+ scale = ( scale === 1 ) ? '' : ( '@' + scale + 'x' );
urlFmt = '/{z}/{x}/{y}' + scale + '.png';
mapData = mw.config.get( 'wgKartographerLiveData' ) || {};
- $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, {
+ $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, {
maxZoom: 18,
attribution: 'Wikimedia maps beta | Map data
© <a href="http://openstreetmap.org/copyright";>OpenStreetMap
contributors</a>'
- }).addTo(map);
+ } ).addTo( map );
- if (overlays) {
+ if ( overlays ) {
geoJson = [];
- $.each(overlays, function (_, group) {
- if (group === '*') {
- $.each(mapData, function (k, d)
{
- if (k[ 0 ] !== '_') {
- geoJson =
geoJson.concat(d);
+ $.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 ] );
}
- });
- 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/262585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3f6f22c47f98116e516749a7d952fd78513175e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
