Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/81661
Change subject: Fix var keywords to go with coding conventions ...................................................................... Fix var keywords to go with coding conventions Change-Id: I5f0daff52bdf4175d9d8ed9770d593d93bf9d986 --- M DataValues/resources/globeCoordinate.js/src/globeCoordinate.Formatter.js M DataValues/resources/globeCoordinate.js/src/globeCoordinate.js M DataValues/resources/globeCoordinate.js/tests/globeCoordinate.Formatter.tests.js 3 files changed, 19 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues refs/changes/61/81661/1 diff --git a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.Formatter.js b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.Formatter.js index 51bfe81..e6f9506 100644 --- a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.Formatter.js +++ b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.Formatter.js @@ -103,9 +103,9 @@ * @return {string} */ degree: function( gc ) { - var lat = gc.getLatitude(), - lon = gc.getLongitude(), - precision = gc.getPrecision(); + var lat = gc.getLatitude(); + var lon = gc.getLongitude(); + var precision = gc.getPrecision(); var text = function( number, sign ) { if( number === undefined ) { @@ -139,8 +139,8 @@ * @return {string} */ Formatter.PRECISIONTEXT = function( precision, options ) { - var precisionText, - combinedOptions = {}; + var precisionText; + var combinedOptions = {}; options = options || {}; diff --git a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js index 06516dc..876bf79 100644 --- a/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js +++ b/DataValues/resources/globeCoordinate.js/src/globeCoordinate.js @@ -108,13 +108,12 @@ * @return {string} */ iso6709: function( decimalCoordinateDefinition ) { - var latitude = decimalCoordinateDefinition.latitude, - longitude = decimalCoordinateDefinition.longitude, - precision = decimalCoordinateDefinition.precision, - lat = globeCoordinate.toDegree( latitude, precision ), - lon = globeCoordinate.toDegree( longitude, precision ), - latISO, - lonISO; + var latitude = decimalCoordinateDefinition.latitude; + var longitude = decimalCoordinateDefinition.longitude; + var precision = decimalCoordinateDefinition.precision; + var lat = globeCoordinate.toDegree( latitude, precision ); + var lon = globeCoordinate.toDegree( longitude, precision ); + var latISO, lonISO; /** * Strips a number's sign and fills the number's integer part with zeroes according to a diff --git a/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.Formatter.tests.js b/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.Formatter.tests.js index a856994..1e75d88 100644 --- a/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.Formatter.tests.js +++ b/DataValues/resources/globeCoordinate.js/tests/globeCoordinate.Formatter.tests.js @@ -48,14 +48,14 @@ } ); QUnit.test( 'precisionText()', function( assert ) { - var c, - precisions = { - 1: 1, - 0.016666666666666666: 1 / 60, - 2.7777777777777776e-7: 1 / 3600000, - 10: '±10°' - }, - formatter = new Formatter(); + var c; + var precisions = { + 1: 1, + 0.016666666666666666: 1 / 60, + 2.7777777777777776e-7: 1 / 3600000, + 10: '±10°' + }; + var formatter = new Formatter(); $.each( precisions, function( testPrecision, expected ) { c = new GlobeCoordinate( -- To view, visit https://gerrit.wikimedia.org/r/81661 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f0daff52bdf4175d9d8ed9770d593d93bf9d986 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DataValues Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits