1 files changed, 23 insertions, 53 deletions

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index f8934669..e2e8e937 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -67,7 +67,7 @@ exports.KeyboardMediator = Montage.create(Component, {
             document.addEventListener("keydown", this, false);
             document.addEventListener("keyup", this, false);
 
-            this.addEventListener("change@appModel.livePreview", this.handleLivePreview, false);
+            this.addPropertyChangeListener("appModel.livePreview", this.handleLivePreview, false);
         }
     },
 
@@ -87,7 +87,8 @@ exports.KeyboardMediator = Montage.create(Component, {
         value: function(evt) {
 
             //keyboard controls for html design view
-            if((!!this.application.ninja.documentController.activeDocument) && (this.application.ninja.documentController.activeDocument.currentView === "design")){
+            // TODO - New template mode doesn't set currentView yet.
+            if((!!this.application.ninja.currentDocument) && (this.application.ninja.currentDocument.currentView === "design")) {
 
                 // Don't do anything if an input or other control is focused
                 if(document.activeElement.nodeName !== "BODY") {
@@ -110,35 +111,35 @@ exports.KeyboardMediator = Montage.create(Component, {
                 // Shortcut for Selection Tool is V
                 if(evt.keyCode === Keyboard.V) {
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[0]});
+                    this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex] });
                     return;
                 }
 
                 // Shortcut for Tag Tool is D
                 if(evt.keyCode === Keyboard.D){
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[4]});
+                    this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.tagToolIndex] });
                     return;
                 }
 
                 // Shortcut for Rotate Tool is W
                 if(evt.keyCode === Keyboard.W){
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[2]});
+                    this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.rotate3DToolIndex] });
                     return;
                 }
 
                 // Shortcut for Translate Tool is G
                 if(evt.keyCode === Keyboard.G){
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[3]});
+                    this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.translate3DToolIndex] });
                     return;
                 }
 
                 // shortcut for Pen tool is P
                 if (evt.keyCode === Keyboard.P){
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[5]});
+                    this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.penToolIndex] });
                     return;
                 }
 
@@ -147,24 +148,24 @@ exports.KeyboardMediator = Montage.create(Component, {
                 // If the user is pressing the command key, they want to refresh the browser.
                 if((evt.keyCode === Keyboard.R) && !evt.metaKey) {
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[7]});
-                    this.application.ninja.handleSelectSubTool({"detail": this.application.ninja.toolsData.defaultToolsData[7].subtools[1]});
+                    this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex] });
+                    this.application.ninja.handleSelectSubTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools[1] });
                     return;
                 }
 
                 // Shortcut for Oval Tool is O
                 if(evt.keyCode === Keyboard.O) {
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[7]});
-                    this.application.ninja.handleSelectSubTool({"detail": this.application.ninja.toolsData.defaultToolsData[7].subtools[0]});
+                    this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex] });
+                    this.application.ninja.handleSelectSubTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools[0] });
                     return;
                 }
 
                 // Shortcut for Line Tool is L
                 if(evt.keyCode === Keyboard.L ) {
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[7]});
-                    this.application.ninja.handleSelectSubTool({"detail": this.application.ninja.toolsData.defaultToolsData[7].subtools[2]});
+                    this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex] });
+                    this.application.ninja.handleSelectSubTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.shapeToolIndex].subtools[2] });
                     return;
                 }
 
@@ -172,38 +173,33 @@ 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[11]});
+                        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[10]});
+                        this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.fillToolIndex] });
                     }
-                    return;
-                }
-
-                // Shortcut for Eyedropper Tool is I
-                if(evt.keyCode === Keyboard.I && !(evt.ctrlKey || evt.metaKey)) {
-                    evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[12]});
-                    return;
+                   return;
                 }
 
                 // Rotate Stage Tool is M
                 if(evt.keyCode === Keyboard.M ) {
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]});
+                    this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.rotateStage3DToolIndex] });
                     return;
                 }
 
                 // Hand tool
                 if(evt.keyCode === Keyboard.H ) {
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]});
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.panToolIndex]});
                     return;
                 }
 
                 // Zoom tool
                 if((evt.keyCode === Keyboard.Z) && !(evt.ctrlKey || evt.metaKey) && !evt.shiftKey) {//ctrl or shift key not press with Z
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]});
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.zoomToolIndex]});
                     return;
                 }
 
@@ -256,7 +252,7 @@ exports.KeyboardMediator = Montage.create(Component, {
     handleKeyup: {
         value: function(evt) {
              //keyboard controls for html design view
-            if((!!this.application.ninja.documentController.activeDocument) && (this.application.ninja.documentController.activeDocument.currentView === "design")){
+            if((!!this.application.ninja.currentDocument) && (this.application.ninja.currentDocument.currentView === "design")) {
                 if(document.activeElement.nodeName !== "BODY") {
                     // Don't do anything if an input or other control is focused
                     return;
@@ -265,31 +261,5 @@ exports.KeyboardMediator = Montage.create(Component, {
                 if(this.application.ninja.toolsData) this.application.ninja.toolsData.selectedToolInstance.HandleKeyUp(evt);
             }
         }
-    },
-    
-    _handleKeydown: {
-        value: function(evt) {
-
-            // Check if cmd-shift-+/ctrl-shift-+ for toggling snapping
-            if(evt.shiftKey && (evt.ctrlKey || evt.metaKey) && (evt.keyCode === 187))
-            {
-                MainMenuModule.MenuActionManager.toggleSnapping("snap", !DocumentManagerModule.DocumentManager.activeDocument.snapping);
-                evt.preventDefault();
-                return;
-            }
-
-            if(evt.keyCode === Keyboard.PLUS && (evt.metaKey||evt.ctrlKey)) {
-                evt.preventDefault();
-                this._toolsList.action("zoomIn", evt);
-                return;
-            }
-
-           if(evt.keyCode === Keyboard.MINUS && (evt.metaKey || evt.ctrlKey)) {
-                evt.preventDefault();
-                this._toolsList.action("zoomOut", evt);
-                return;
-            }
-
-         }