From d4a110bf2c7a949c627966ed01db7a4d32d62757 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 10:04:19 -0800 Subject: Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 22 +++++++++++----------- js/mediators/keyboard-mediator.js | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'js') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 00de9236..96367203 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -157,17 +157,17 @@ exports.ToolsData = Montage.create(Montage, { "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": "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", diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index a4bf9baa..5b044f8a 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js @@ -165,14 +165,14 @@ exports.KeyboardMediator = Montage.create(Component, { // Hand tool if(evt.keyCode === Keyboard.H ) { evt.preventDefault(); - this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]}); + this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]}); return; } // Zoom tool if(evt.keyCode === Keyboard.Z ) { evt.preventDefault(); - this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]}); + this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]}); return; } -- cgit v1.2.3