From 7f35934e65152b3cca81dc19c346a502b921a100 Mon Sep 17 00:00:00 2001
From: Isaiah Odhner <isaiahodhner@gmail.com>
Date: Mon, 3 Mar 2014 23:06:08 -0500
Subject: [PATCH] simplify button selection and allow picking a ternary color
 before one has been selected

---
 app.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app.js b/app.js
index 9b5cc51..7f5a907 100644
--- a/app.js
+++ b/app.js
@@ -719,11 +719,13 @@ app.open = function(){
 			ctx.fillStyle = fill_color = 
 			ctx.strokeStyle = stroke_color = 
 				colors[
-					fill_color_i =
-					stroke_color_i =
-						(ctrl && colors[2]) ? 2 :
-						(reverse ? 1 : 0)
+					(ctrl && colors[2]) ? 2 :
+					(reverse ? 1 : 0)
 				];
+			
+			fill_color_i =
+			stroke_color_i =
+				ctrl ? 2 : (reverse ? 1 : 0)
 		}
 		
 		if(selected_tool[event_name]){
@@ -871,19 +873,15 @@ app.open = function(){
 				$buttons.removeClass("selected");
 				
 				if(selected_tool === tool && tool.deselect){
-					$.each(tools, function(j, _tool){
-						if(_tool === previous_tool){
-							selected_tool = previous_tool;
-							previous_tool.$button.addClass("selected");
-						}
-					});
+					selected_tool = previous_tool;
 				}else{
 					if(!tool.deselect){
 						previous_tool = tool;
 					}
 					selected_tool = tool;
-					$b.addClass("selected");
 				}
+				
+				selected_tool.$button.addClass("selected");
 			});
 		});
 		$buttons = $tools.find(".jspaint-tool");