From c033d65cde6153402a455b9bde740f889a3db3a8 Mon Sep 17 00:00:00 2001
From: jdescottes <julian.descottes@gmail.com>
Date: Sun, 17 Nov 2013 22:47:21 +0100
Subject: [PATCH] fix : tool icon not selected when using shortcut

---
 js/controller/ToolController.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/js/controller/ToolController.js b/js/controller/ToolController.js
index 0c9d8499..2b62fd4a 100644
--- a/js/controller/ToolController.js
+++ b/js/controller/ToolController.js
@@ -57,9 +57,15 @@
    * @private
    */
   ns.ToolController.prototype.selectTool_ = function(tool) {
-    console.log("Selecting Tool:" , this.currentSelectedTool.name);
     this.currentSelectedTool = tool;
     this.activateToolOnStage_(this.currentSelectedTool);
+
+    var selectedToolElement = $('#tool-section .tool-icon.selected');
+    var toolElement = $('[data-tool-id=' + tool.instance.toolId + ']');
+
+    selectedToolElement.removeClass('selected');
+    toolElement.addClass('selected');
+
     $.publish(Events.TOOL_SELECTED, [tool.instance]);
   };
 
@@ -75,10 +81,6 @@
       var tool = this.getToolById_(toolId);
       if (tool) {
         this.selectTool_(tool);
-
-        // Show tool as selected:
-        $('#tool-section .tool-icon.selected').removeClass('selected');
-        clickedTool.addClass('selected');
       }
     }
   };