aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-24 10:04:19 -0800
committerNivesh Rajbhandari2012-02-24 10:04:19 -0800
commitd4a110bf2c7a949c627966ed01db7a4d32d62757 (patch)
treee491221e2908d579cba6152bec9a2abcc40efc91 /js
parent2f2472efe0ca55d52fcdf4934bfa52008b68e1de (diff)
downloadninja-d4a110bf2c7a949c627966ed01db7a4d32d62757.tar.gz
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 <mqg734@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/data/tools-data.js22
-rwxr-xr-xjs/mediators/keyboard-mediator.js4
2 files changed, 13 insertions, 13 deletions
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, {
157 "container": false, 157 "container": false,
158 "selected": false 158 "selected": false
159 }, 159 },
160// { 160 {
161// "id": "InkBottleTool", 161 "id": "InkBottleTool",
162// "properties": "inkbottleProperties", 162 "properties": "inkbottleProperties",
163// "spriteSheet": true, 163 "spriteSheet": true,
164// "action": "InkBottleTool", 164 "action": "InkBottleTool",
165// "toolTip": "Ink Bottle Tool", 165 "toolTip": "Ink Bottle Tool",
166// "cursor": "url('images/tools/inkbottle_down.png'), default", 166 "cursor": "url('images/tools/inkbottle_down.png'), default",
167// "lastInGroup": false, 167 "lastInGroup": false,
168// "container": false, 168 "container": false,
169// "selected": false 169 "selected": false
170// }, 170 },
171 { 171 {
172 "id": "EyedropperTool", 172 "id": "EyedropperTool",
173 "properties": "eyedropperProperties", 173 "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, {
165 // Hand tool 165 // Hand tool
166 if(evt.keyCode === Keyboard.H ) { 166 if(evt.keyCode === Keyboard.H ) {
167 evt.preventDefault(); 167 evt.preventDefault();
168 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]}); 168 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]});
169 return; 169 return;
170 } 170 }
171 171
172 // Zoom tool 172 // Zoom tool
173 if(evt.keyCode === Keyboard.Z ) { 173 if(evt.keyCode === Keyboard.Z ) {
174 evt.preventDefault(); 174 evt.preventDefault();
175 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]}); 175 this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]});
176 return; 176 return;
177 } 177 }
178 178