Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document

4 files changed, 19 insertions, 4 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index deca9f83..f3c135ed 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -41,7 +41,7 @@ exports.HtmlDocument = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
     exclusionList: {
-        value: [] //TODO: Update to correct list
+        value: ["HTML", "BODY"] //TODO: Update to correct list
     },
         ////////////////////////////////////////////////////////////////////
         //
@@ -73,7 +73,7 @@ exports.HtmlDocument = Montage.create(Component, {
                 views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic
             });
             //Initiliazing views and hiding
-                if (this.model.views.design.initiliaze(document.getElementById("iframeContainer"))) {
+                if (this.model.views.design.initialize(document.getElementById("iframeContainer"))) {
                         //Hiding iFrame, just initiliazing
                         this.model.views.design.hide();
                 } else {
@@ -115,6 +115,12 @@ exports.HtmlDocument = Montage.create(Component, {
             this.loaded.callback.call(this.loaded.context, this);
             //Setting opacity to be viewable after load
                         this.model.views.design.iframe.style.opacity = 1;
+
+
+
+
+
+            this.application.ninja.appModel.show3dGrid = true;
         }
     }
     ////////////////////////////////////////////////////////////////////
diff --git a/js/document/models/html.js b/js/document/models/html.js
index f45a0e21..5eedb731 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -15,6 +15,10 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         //
         hasTemplate: {
         value: false
+    },
+
+    draw3DGrid: {
+        value: false
     }
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
index 1c6b6287..47964ae4 100755
--- a/js/document/templates/montage-web/index.html
+++ b/js/document/templates/montage-web/index.html
@@ -23,8 +23,13 @@
                         padding: 0;
                                 position: absolute;
                                 -webkit-transform-style: preserve-3d;
-                                -webkit-perspective: 1400px;
+                                -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
                         }
+
+            html, body {
+                width: 100%;
+                height: 100%;
+            }
                         
                         ninjaloadinghack {
                                 display: none;
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 4f598305..6cce229c 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -49,7 +49,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     },
     ////////////////////////////////////////////////////////////////////
         //
-        initiliaze: {
+        initialize: {
         value: function (parent) {
                 //Creating iFrame for view
                 this.iframe = document.createElement("iframe");