Merge branch 'refs/heads/master' into file-io

1 files changed, 25 insertions, 25 deletions

diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index de965dbc..4847fa7c 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -28,7 +28,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "SubselectionTool",
                 "toolTip":      "Subselect Tool",
                 "cursor":       "auto",
-                "lastInGroup":  false,
+                "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             },
@@ -153,21 +153,21 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "FillTool",
                 "toolTip":      "Fill Tool",
                 "cursor":       "url('images/tools/bucket_down.png'), default",
-                "lastInGroup":  false,
-                "container":    false,
-                "selected":     false
-            },
-            {
-                "id":           "InkBottleTool",
-                "properties":   "inkbottleProperties",
-                "spriteSheet":  true,
-                "action":       "InkBottleTool",
-                "toolTip":      "Ink Bottle Tool",
-                "cursor":       "url('images/tools/inkbottle_down.png'), default",
-                "lastInGroup":  false,
+                "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             },
+//            {
+//                "id":           "InkBottleTool",
+//                "properties":   "inkbottleProperties",
+//                "spriteSheet":  true,
+//                "action":       "InkBottleTool",
+//                "toolTip":      "Ink Bottle Tool",
+//                "cursor":       "url('images/tools/inkbottle_down.png'), default",
+//                "lastInGroup":  false,
+//                "container":    false,
+//                "selected":     false
+//            },
             {
                 "id":           "EyedropperTool",
                 "properties":   "eyedropperProperties",
@@ -179,17 +179,17 @@ exports.ToolsData = Montage.create(Montage, {
                 "container":    false,
                 "selected":     false
             },
-            {
-                "id":           "EraserTool",
-                "properties":   "eraserProperties",
-                "spriteSheet":  true,
-                "action":       "EraserTool",
-                "toolTip":      "Eraser Tool",
-                "cursor":       "auto",
-                "lastInGroup":  false,
-                "container":    false,
-                "selected":     false
-            },
+//            {
+//                "id":           "EraserTool",
+//                "properties":   "eraserProperties",
+//                "spriteSheet":  true,
+//                "action":       "EraserTool",
+//                "toolTip":      "Eraser Tool",
+//                "cursor":       "auto",
+//                "lastInGroup":  false,
+//                "container":    false,
+//                "selected":     false
+//            },
             {
                 "id":           "RotateStageTool3D",
                 "properties":   "rotateStageProperties",
@@ -219,7 +219,7 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "ZoomTool",
                 "toolTip":      "Zoom Tool (Z)",
                 "cursor":       "url('images/cursors/zoom.png'),default",
-                "lastInGroup":  false,
+                "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             }