Merge branch '3118-modes' of https://github.com/davidchouse/iD into davidchouse-3118-modes

Makefile

@@ -44,6 +44,7 @@ $(BUILDJS_TARGETS): $(BUILDJS_SOURCES) build.js
 
 MODULE_TARGETS = \
 	js/lib/id/actions.js \
+	js/lib/id/modes.js \
 	js/lib/id/presets.js \
 	js/lib/id/validations.js \
 	js/lib/id/util.js
@@ -60,6 +61,9 @@ js/lib/id/validations.js: modules/
 js/lib/id/util.js: modules/
 	node_modules/.bin/rollup -f umd -n iD.util modules/util/index.js --no-strict > $@
 
+js/lib/id/modes.js: modules/
+	node_modules/.bin/rollup -f umd -n iD.modes modules/modes/index.js --no-strict > $@
+
 dist/iD.js: \
 	js/lib/bootstrap-tooltip.js \
 	js/lib/d3.v3.js \
@@ -108,18 +112,6 @@ dist/iD.js: \
 	js/id/behavior/paste.js \
 	js/id/behavior/select.js \
 	js/id/behavior/tail.js \
-	js/id/modes.js \
-	js/id/modes/add_area.js \
-	js/id/modes/add_line.js \
-	js/id/modes/add_point.js \
-	js/id/modes/browse.js \
-	js/id/modes/drag_node.js \
-	js/id/modes/draw_area.js \
-	js/id/modes/draw_line.js \
-	js/id/modes/move.js \
-	js/id/modes/rotate_way.js \
-	js/id/modes/save.js \
-	js/id/modes/select.js \
 	js/id/operations.js \
 	js/id/operations/circularize.js \
 	js/id/operations/continue.js \

modules/modes/add_area.js

@@ -1,4 +1,4 @@
-iD.modes.AddArea = function(context) {
+export function AddArea(context) {
     var mode = {
         id: 'add-area',
         button: 'area',
@@ -64,4 +64,4 @@ iD.modes.AddArea = function(context) {
     };
 
     return mode;
-};
+}

modules/modes/add_line.js

@@ -1,4 +1,4 @@
-iD.modes.AddLine = function(context) {
+export function AddLine(context) {
     var mode = {
         id: 'add-line',
         button: 'line',
@@ -60,4 +60,4 @@ iD.modes.AddLine = function(context) {
     };
 
     return mode;
-};
+}

modules/modes/add_point.js

@@ -1,4 +1,4 @@
-iD.modes.AddPoint = function(context) {
+export function AddPoint(context) {
     var mode = {
         id: 'add-point',
         button: 'point',
@@ -49,4 +49,4 @@ iD.modes.AddPoint = function(context) {
     };
 
     return mode;
-};
+}

modules/modes/browse.js

@@ -1,4 +1,4 @@
-iD.modes.Browse = function(context) {
+export function Browse(context) {
     var mode = {
         button: 'browse',
         id: 'browse',
@@ -49,4 +49,4 @@ iD.modes.Browse = function(context) {
     };
 
     return mode;
-};
+}

modules/modes/drag_node.js

@@ -1,4 +1,4 @@
-iD.modes.DragNode = function(context) {
+export function DragNode(context) {
     var mode = {
         id: 'drag-node',
         button: 'browse'
@@ -212,4 +212,4 @@ iD.modes.DragNode = function(context) {
     mode.behavior = behavior;
 
     return mode;
-};
+}

modules/modes/draw_area.js

@@ -1,4 +1,4 @@
-iD.modes.DrawArea = function(context, wayId, baseGraph) {
+export function DrawArea(context, wayId, baseGraph) {
     var mode = {
         button: 'area',
         id: 'draw-area'
@@ -36,4 +36,4 @@ iD.modes.DrawArea = function(context, wayId, baseGraph) {
     };
 
     return mode;
-};
+}

modules/modes/draw_line.js

@@ -1,4 +1,4 @@
-iD.modes.DrawLine = function(context, wayId, baseGraph, affix) {
+export function DrawLine(context, wayId, baseGraph, affix) {
     var mode = {
         button: 'line',
         id: 'draw-line'
@@ -36,4 +36,4 @@ iD.modes.DrawLine = function(context, wayId, baseGraph, affix) {
     };
 
     return mode;
-};
+}

modules/modes/index.js

@@ -0,0 +1,11 @@
+export { AddArea } from './add_area';
+export { AddLine } from './add_line';
+export { AddPoint } from './add_point';
+export { Browse } from './browse';
+export { DragNode } from './drag_node';
+export { DrawArea } from './draw_area';
+export { DrawLine } from './draw_line';
+export { Move } from './move';
+export { RotateWay } from './rotate_way';
+export { Save } from './save';
+export { Select } from './select';

modules/modes/move.js

@@ -1,4 +1,4 @@
-iD.modes.Move = function(context, entityIDs, baseGraph) {
+export function Move(context, entityIDs, baseGraph) {
     var mode = {
         id: 'move',
         button: 'browse'
@@ -119,4 +119,4 @@ iD.modes.Move = function(context, entityIDs, baseGraph) {
     };
 
     return mode;
-};
+}

modules/modes/rotate_way.js

@@ -1,4 +1,4 @@
-iD.modes.RotateWay = function(context, wayId) {
+export function RotateWay(context, wayId) {
     var mode = {
         id: 'rotate-way',
         button: 'browse'
@@ -80,4 +80,4 @@ iD.modes.RotateWay = function(context, wayId) {
     };
 
     return mode;
-};
+}

modules/modes/save.js

@@ -1,4 +1,4 @@
-iD.modes.Save = function(context) {
+export function Save(context) {
     var ui = iD.ui.Commit(context)
             .on('cancel', cancel)
             .on('save', save);
@@ -327,4 +327,4 @@ iD.modes.Save = function(context) {
     };
 
     return mode;
-};
+}

modules/modes/select.js

@@ -1,4 +1,4 @@
-iD.modes.Select = function(context, selectedIDs) {
+export function Select(context, selectedIDs) {
     var mode = {
         id: 'select',
         button: 'browse'
@@ -243,4 +243,4 @@ iD.modes.Select = function(context, selectedIDs) {
     };
 
     return mode;
-};
+}

test/index.html

@@ -45,6 +45,7 @@
 <<<<<<< 6c7786ab274f46879f15cbb3ba2016a540cf8df5
     <script src='../js/lib/id/presets.js'></script>
     <script src='../js/lib/id/validations.js'></script>
+    <script src='../js/lib/id/modes.js'></script>
 
     <script src='../js/id/util.js'></script>
 =======
@@ -154,18 +155,6 @@
     <script src='../js/id/behavior/select.js'></script>
     <script src='../js/id/behavior/tail.js'></script>
 
-    <script src='../js/id/modes.js'></script>
-    <script src='../js/id/modes/add_area.js'></script>
-    <script src='../js/id/modes/add_point.js'></script>
-    <script src='../js/id/modes/add_line.js'></script>
-    <script src='../js/id/modes/browse.js'></script>
-    <script src='../js/id/modes/drag_node.js'></script>
-    <script src='../js/id/modes/draw_area.js'></script>
-    <script src='../js/id/modes/draw_line.js'></script>
-    <script src='../js/id/modes/move.js'></script>
-    <script src='../js/id/modes/rotate_way.js'></script>
-    <script src='../js/id/modes/select.js'></script>
-
     <script src='../js/id/operations.js'></script>
     <script src='../js/id/operations/continue.js'></script>
     <script src='../js/id/operations/circularize.js'></script>