2 files changed, 7 insertions, 30 deletions

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index b0aba5b6..59086ef6 100755
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -114,11 +114,13 @@ exports.DragDropMediator = Montage.create(Component, {
                             var self = this;
                                                 //
                                                 if (e.currentTarget.fileType.indexOf('svg') !== -1) {
-                                                        element = NJUtils.makeNJElement('embed', 'SVG', 'block');//TODO: Verify this is proper
+                                                        element = NJUtils.make('embed', null, this.application.ninja.currentDocument);//TODO: Verify this is proper
+                                NJUtils.createModelWithSelection(element, "SVG");
                                                         element.type = 'image/svg+xml';
                                         element.src = url+'/'+fileName;
                                                 } else {
-                                                        element = NJUtils.makeNJElement('image', 'image', 'image');
+                                                        element = NJUtils.make('image', null, this.application.ninja.currentDocument);
+                                NJUtils.createModel(element);
                                         element.src = url+'/'+fileName;
                                                 }
                                                 //Adding element once it is loaded
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index f8934669..49960f58 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -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.model.currentView === "design")){
 
                 // Don't do anything if an input or other control is focused
                 if(document.activeElement.nodeName !== "BODY") {
@@ -256,7 +257,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.model.currentView === "design")){
                 if(document.activeElement.nodeName !== "BODY") {
                     // Don't do anything if an input or other control is focused
                     return;
@@ -265,31 +266,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;
-            }
-
-         }
     }
 });