Merge branch 'inter-require' of github.com:openstreetmap/iD into inter-require

.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"]

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');

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 */

modules/.eslintrc

@@ -0,0 +1,6 @@
+{
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    }
+}

modules/actions/add_entity.js

@@ -2,4 +2,4 @@ export function AddEntity(way) {
     return function(graph) {
         return graph.replace(way);
     };
-};
+}

modules/actions/add_member.js

@@ -26,4 +26,4 @@ export function AddMember(relationId, member, memberIndex) {
 
         return graph.replace(relation.addMember(member, memberIndex));
     };
-};
+}

modules/actions/add_midpoint.js

@@ -20,4 +20,4 @@ export function AddMidpoint(midpoint, node) {
 
         return graph;
     };
-};
+}

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));
     };
-};
+}

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));
     };
-};
+}

modules/actions/change_preset.js

@@ -9,4 +9,4 @@ export function ChangePreset(entityId, oldPreset, newPreset) {
 
         return graph.replace(entity.update({tags: tags}));
     };
-};
+}

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}));
     };
-};
+}

modules/actions/circularize.js

@@ -180,4 +180,4 @@ export function Circularize(wayId, projection, maxAngle) {
     };
 
     return action;
-};
+}

modules/actions/connect.js

@@ -41,4 +41,4 @@ export function Connect(nodeIds) {
 
         return graph;
     };
-};
+}

modules/actions/copy_entities.js

@@ -18,4 +18,4 @@ export function CopyEntities(ids, fromGraph) {
     };
 
     return action;
-};
+}

modules/actions/delete_member.js

@@ -12,4 +12,4 @@ export function DeleteMember(relationId, memberIndex) {
 
         return graph;
     };
-};
+}

modules/actions/delete_multiple.js

@@ -28,4 +28,4 @@ export function DeleteMultiple(ids) {
     };
 
     return action;
-};
+}

modules/actions/delete_node.js

@@ -34,4 +34,4 @@ export function DeleteNode(nodeId) {
     };
 
     return action;
-};
+}

modules/actions/delete_way.js

@@ -48,4 +48,4 @@ export function DeleteWay(wayId) {
     };
 
     return action;
-};
+}

modules/actions/merge_remote_changes.js

@@ -254,4 +254,4 @@ export function MergeRemoteChanges(id, localGraph, remoteGraph, formatUser) {
     };
 
     return action;
-};
+}

modules/actions/move.js

@@ -276,4 +276,4 @@ export function Move(moveIds, tryDelta, projection, cache) {
     };
 
     return action;
-};
+}

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",