From 092e7be1972193b293a2492d81e819e0d7b486c2 Mon Sep 17 00:00:00 2001 From: Kushan Joshi <0o3ko0@gmail.com> Date: Tue, 14 Jun 2016 18:50:56 +0530 Subject: [PATCH 1/2] Lint modules directory --- .eslintrc | 3 +-- js/id/id.js | 2 +- js/id/modes/save.js | 2 +- modules/.eslintrc | 6 ++++++ package.json | 3 ++- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 modules/.eslintrc diff --git a/.eslintrc b/.eslintrc index 22a0db488..e8bdcb6be 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,11 +4,11 @@ "dot-notation": 2, "eqeqeq": [2, "smart"], "indent": [0, 4], + "keyword-spacing": 2, "linebreak-style": [2, "unix"], "no-caller": 2, "no-catch-shadow": 2, "no-div-regex": 2, - "no-empty-label": 2, "no-extend-native": 2, "no-extra-bind": 2, "no-floating-decimal": 2, @@ -45,7 +45,6 @@ "no-use-before-define": [0, "nofunc"], "semi": [2, "always"], "semi-spacing": 2, - "space-return-throw-case": 2, "space-unary-ops": 2, "wrap-regex": 0, "quotes": [2, "single"] diff --git a/js/id/id.js b/js/id/id.js index 050fdcc66..b81400115 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -23,7 +23,7 @@ window.iD = function () { if (arguments.length === 1) return storage.getItem(k); else if (v === null) storage.removeItem(k); else storage.setItem(k, v); - } catch(e) { + } catch (e) { // localstorage quota exceeded /* eslint-disable no-console */ if (typeof console !== 'undefined') console.error('localStorage quota exceeded'); diff --git a/js/id/modes/save.js b/js/id/modes/save.js index ad128ecb1..8cbd3e317 100644 --- a/js/id/modes/save.js +++ b/js/id/modes/save.js @@ -15,7 +15,7 @@ iD.modes.Save = function(context) { try { var cn = graph.childNodes(e); result.push.apply(result, _.map(_.filter(cn, 'version'), 'id')); - } catch(err) { + } catch (err) { /* eslint-disable no-console */ if (typeof console !== 'undefined') console.error(err); /* eslint-enable no-console */ diff --git a/modules/.eslintrc b/modules/.eslintrc new file mode 100644 index 000000000..f482330f6 --- /dev/null +++ b/modules/.eslintrc @@ -0,0 +1,6 @@ +{ + "parserOptions": { + "ecmaVersion": 6, + "sourceType": "module" + } +} diff --git a/package.json b/package.json index 76df2d108..d796e8799 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "test": "npm run lint && phantomjs node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js test/index.html dot && make && phantomjs node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js test/index_packaged.html dot", "start": "http-server .", "lint": "eslint js/id && npm run lint:spec:actions", + "lint:modules": "eslint modules", "lint:spec:actions": "eslint test/spec/actions" }, "repository": { @@ -27,7 +28,7 @@ "chai": "~1.9.2", "d3": "3.5.5", "editor-layer-index": "git://github.com/osmlab/editor-layer-index.git#gh-pages", - "eslint": "^1.10.3", + "eslint": "^2.12.0", "glob": "~3.1.21", "happen": "0.1.2", "http-server": "^0.9.0", From ff1ee79f6ef6072c2604b79164a342bfbbe8b7df Mon Sep 17 00:00:00 2001 From: Kushan Joshi <0o3ko0@gmail.com> Date: Tue, 14 Jun 2016 18:52:48 +0530 Subject: [PATCH 2/2] Fix minor linting errors in modules/actions --- modules/actions/add_entity.js | 2 +- modules/actions/add_member.js | 2 +- modules/actions/add_midpoint.js | 2 +- modules/actions/add_vertex.js | 2 +- modules/actions/change_member.js | 2 +- modules/actions/change_preset.js | 2 +- modules/actions/change_tags.js | 2 +- modules/actions/circularize.js | 2 +- modules/actions/connect.js | 2 +- modules/actions/copy_entities.js | 2 +- modules/actions/delete_member.js | 2 +- modules/actions/delete_multiple.js | 2 +- modules/actions/delete_node.js | 2 +- modules/actions/delete_way.js | 2 +- modules/actions/merge_remote_changes.js | 2 +- modules/actions/move.js | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/actions/add_entity.js b/modules/actions/add_entity.js index d55672e11..2a802693d 100644 --- a/modules/actions/add_entity.js +++ b/modules/actions/add_entity.js @@ -2,4 +2,4 @@ export function AddEntity(way) { return function(graph) { return graph.replace(way); }; -}; +} diff --git a/modules/actions/add_member.js b/modules/actions/add_member.js index cee31aaa7..6e7a1e688 100644 --- a/modules/actions/add_member.js +++ b/modules/actions/add_member.js @@ -26,4 +26,4 @@ export function AddMember(relationId, member, memberIndex) { return graph.replace(relation.addMember(member, memberIndex)); }; -}; +} diff --git a/modules/actions/add_midpoint.js b/modules/actions/add_midpoint.js index 66f8fcbd7..94a458a8f 100644 --- a/modules/actions/add_midpoint.js +++ b/modules/actions/add_midpoint.js @@ -20,4 +20,4 @@ export function AddMidpoint(midpoint, node) { return graph; }; -}; +} diff --git a/modules/actions/add_vertex.js b/modules/actions/add_vertex.js index 21b398206..29473c286 100644 --- a/modules/actions/add_vertex.js +++ b/modules/actions/add_vertex.js @@ -3,4 +3,4 @@ export function AddVertex(wayId, nodeId, index) { return function(graph) { return graph.replace(graph.entity(wayId).addNode(nodeId, index)); }; -}; +} diff --git a/modules/actions/change_member.js b/modules/actions/change_member.js index 60ccf6847..5c2df07c2 100644 --- a/modules/actions/change_member.js +++ b/modules/actions/change_member.js @@ -2,4 +2,4 @@ export function ChangeMember(relationId, member, memberIndex) { return function(graph) { return graph.replace(graph.entity(relationId).updateMember(member, memberIndex)); }; -}; +} diff --git a/modules/actions/change_preset.js b/modules/actions/change_preset.js index 2f6104716..d35278d3d 100644 --- a/modules/actions/change_preset.js +++ b/modules/actions/change_preset.js @@ -9,4 +9,4 @@ export function ChangePreset(entityId, oldPreset, newPreset) { return graph.replace(entity.update({tags: tags})); }; -}; +} diff --git a/modules/actions/change_tags.js b/modules/actions/change_tags.js index 9b4d2485f..703b5bdcb 100644 --- a/modules/actions/change_tags.js +++ b/modules/actions/change_tags.js @@ -3,4 +3,4 @@ export function ChangeTags(entityId, tags) { var entity = graph.entity(entityId); return graph.replace(entity.update({tags: tags})); }; -}; +} diff --git a/modules/actions/circularize.js b/modules/actions/circularize.js index 7a8493649..076a5990b 100644 --- a/modules/actions/circularize.js +++ b/modules/actions/circularize.js @@ -180,4 +180,4 @@ export function Circularize(wayId, projection, maxAngle) { }; return action; -}; +} diff --git a/modules/actions/connect.js b/modules/actions/connect.js index 32753c3ca..9134c1ccb 100644 --- a/modules/actions/connect.js +++ b/modules/actions/connect.js @@ -41,4 +41,4 @@ export function Connect(nodeIds) { return graph; }; -}; +} diff --git a/modules/actions/copy_entities.js b/modules/actions/copy_entities.js index 020ea7268..1e87404b9 100644 --- a/modules/actions/copy_entities.js +++ b/modules/actions/copy_entities.js @@ -18,4 +18,4 @@ export function CopyEntities(ids, fromGraph) { }; return action; -}; +} diff --git a/modules/actions/delete_member.js b/modules/actions/delete_member.js index 70e0ad9b0..a221615b7 100644 --- a/modules/actions/delete_member.js +++ b/modules/actions/delete_member.js @@ -12,4 +12,4 @@ export function DeleteMember(relationId, memberIndex) { return graph; }; -}; +} diff --git a/modules/actions/delete_multiple.js b/modules/actions/delete_multiple.js index fb9e9ab80..809bff189 100644 --- a/modules/actions/delete_multiple.js +++ b/modules/actions/delete_multiple.js @@ -28,4 +28,4 @@ export function DeleteMultiple(ids) { }; return action; -}; +} diff --git a/modules/actions/delete_node.js b/modules/actions/delete_node.js index 5f7b34cc6..84a1d5481 100644 --- a/modules/actions/delete_node.js +++ b/modules/actions/delete_node.js @@ -34,4 +34,4 @@ export function DeleteNode(nodeId) { }; return action; -}; +} diff --git a/modules/actions/delete_way.js b/modules/actions/delete_way.js index 265ebbcad..b6f256ebd 100644 --- a/modules/actions/delete_way.js +++ b/modules/actions/delete_way.js @@ -48,4 +48,4 @@ export function DeleteWay(wayId) { }; return action; -}; +} diff --git a/modules/actions/merge_remote_changes.js b/modules/actions/merge_remote_changes.js index 1133ca560..6c2cb7012 100644 --- a/modules/actions/merge_remote_changes.js +++ b/modules/actions/merge_remote_changes.js @@ -254,4 +254,4 @@ export function MergeRemoteChanges(id, localGraph, remoteGraph, formatUser) { }; return action; -}; +} diff --git a/modules/actions/move.js b/modules/actions/move.js index 58209b400..93257e20e 100644 --- a/modules/actions/move.js +++ b/modules/actions/move.js @@ -276,4 +276,4 @@ export function Move(moveIds, tryDelta, projection, cache) { }; return action; -}; +}