Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/io/system/ninjalibrary.json

1 files changed, 4 insertions, 29 deletions

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 029c0916..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") {
@@ -251,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;
@@ -260,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;
-            }
-
-         }
     }
 });