From 26c4d00b3e5d39c1c313d48433abebd06f386a85 Mon Sep 17 00:00:00 2001
From: John Mayhew
Date: Wed, 16 May 2012 14:37:10 -0700
Subject: fixed bug with keyboard shortcut for fill/ink tool

---
 js/mediators/keyboard-mediator.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'js/mediators')

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 665e3ce7..029c0916 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -172,11 +172,13 @@ exports.KeyboardMediator = Montage.create(Component, {
                 if(evt.keyCode === Keyboard.K ) {
                     evt.preventDefault();
                     if(this.application.ninja.toolsData.selectedTool.id === "FillTool") {
+                        this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.inkBottleToolIndex] });
+                    } else if(this.application.ninja.toolsData.selectedTool.id === "InkBottleTool") {
                         this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.fillToolIndex] });
                     } else {
-                        this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.inkBottleToolIndex] });
+                        this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.fillToolIndex] });
                     }
-                    return;
+                   return;
                 }
 
                 // Rotate Stage Tool is M
-- 
cgit v1.2.3