From 8d01c02c29bb48f46e1aaacb9bfdec8d0ca67c84 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 15 Aug 2017 17:54:21 +1200
Subject: [PATCH] Tidy clearing color swatches

---
 scripts/vr-edit/modules/toolMenu.js | 48 ++++++++++++-----------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/scripts/vr-edit/modules/toolMenu.js b/scripts/vr-edit/modules/toolMenu.js
index 0df93cce3c..9f6ff12382 100644
--- a/scripts/vr-edit/modules/toolMenu.js
+++ b/scripts/vr-edit/modules/toolMenu.js
@@ -305,9 +305,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     command: {
                         method: "setColorPerSwatch"
                     },
-                    onGripClicked: {
-                        method: "clearSwatch",
-                        parameter: "colorSwatch1"
+                    clear: {
+                        method: "clearSwatch"
                     }
                 },
                 {
@@ -325,9 +324,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     command: {
                         method: "setColorPerSwatch"
                     },
-                    onGripClicked: {
-                        method: "clearSwatch",
-                        parameter: "colorSwatch2"
+                    clear: {
+                        method: "clearSwatch"
                     }
                 },
                 {
@@ -345,9 +343,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     command: {
                         method: "setColorPerSwatch"
                     },
-                    onGripClicked: {
-                        method: "clearSwatch",
-                        parameter: "colorSwatch3"
+                    clear: {
+                        method: "clearSwatch"
                     }
                 },
                 {
@@ -365,9 +362,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     command: {
                         method: "setColorPerSwatch"
                     },
-                    onGripClicked: {
-                        method: "clearSwatch",
-                        parameter: "colorSwatch4"
+                    clear: {
+                        method: "clearSwatch"
                     }
                 },
                 {
@@ -385,9 +381,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     command: {
                         method: "setColorPerSwatch"
                     },
-                    onGripClicked: {
-                        method: "clearSwatch",
-                        parameter: "colorSwatch5"
+                    clear: {
+                        method: "clearSwatch"
                     }
                 },
                 {
@@ -405,9 +400,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     command: {
                         method: "setColorPerSwatch"
                     },
-                    onGripClicked: {
-                        method: "clearSwatch",
-                        parameter: "colorSwatch6"
+                    clear: {
+                        method: "clearSwatch"
                     }
                 },
                 {
@@ -425,9 +419,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     command: {
                         method: "setColorPerSwatch"
                     },
-                    onGripClicked: {
-                        method: "clearSwatch",
-                        parameter: "colorSwatch7"
+                    clear: {
+                        method: "clearSwatch"
                     }
                 },
                 {
@@ -445,9 +438,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
                     command: {
                         method: "setColorPerSwatch"
                     },
-                    onGripClicked: {
-                        method: "clearSwatch",
-                        parameter: "colorSwatch8"
+                    clear: {
+                        method: "clearSwatch"
                     }
                 },
                 {
@@ -1224,12 +1216,10 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
         // Grip click.
         if (controlHand.gripClicked() !== isGripClicked) {
             isGripClicked = !isGripClicked;
-            if (isGripClicked && intersectionItems && intersectedItem && intersectionItems[intersectedItem].onGripClicked) {
+            if (isGripClicked && intersectionItems && intersectedItem && intersectionItems[intersectedItem].clear) {
                 controlHand.setGripClickedHandled();
-                if (intersectionItems[intersectedItem].onGripClicked.parameter) {
-                    parameter = intersectionItems[intersectedItem].onGripClicked.parameter;
-                }
-                doGripClicked(intersectionItems[intersectedItem].onGripClicked.method, parameter);
+                parameter = intersectionItems[intersectedItem].id;
+                doGripClicked(intersectionItems[intersectedItem].clear.method, parameter);
             }
         }