Merge branch 'refs/heads/dom-architecture' into binding

2 files changed, 4 insertions, 4 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 483dacbc..f71a6f4d 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -86,7 +86,7 @@ exports.ElementMediator = Montage.create(Component, {
     replaceElement: {
         value: function(newChild, oldChild, notify) {
 
-            this.application.ninja.currentDocument.documentRoot.replaceChild(newChild, oldChild);
+            this.application.ninja.currentDocument.model.documentRoot.replaceChild(newChild, oldChild);
 
             var undoLabel = "replace element";
 
@@ -520,7 +520,7 @@ exports.ElementMediator = Montage.create(Component, {
         value: function(layersDraggedArray, layerDroppedAfter) {
             var documentRoot,length;
 
-            documentRoot = this.application.ninja.currentDocument.documentRoot;
+            documentRoot = this.application.ninja.currentDocument.model.documentRoot;
             length = layersDraggedArray.length;
 
             for(var i=0; documentRoot.children[i]; i++) {
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 2f55edb4..e2e8e937 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -88,7 +88,7 @@ exports.KeyboardMediator = Montage.create(Component, {
 
             //keyboard controls for html design view
             // TODO - New template mode doesn't set currentView yet.
-            if((!!this.application.ninja.currentDocument) && (this.application.ninja.currentDocument.model.currentView === "design")){
+            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") {
@@ -252,7 +252,7 @@ exports.KeyboardMediator = Montage.create(Component, {
     handleKeyup: {
         value: function(evt) {
              //keyboard controls for html design view
-            if((!!this.application.ninja.currentDocument)){// && (this.application.ninja.currentDocument.model.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;