Merge branch 'master' into pentool

6 files changed, 64 insertions, 10 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 8cb88516..89717dd6 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -31,6 +31,10 @@ exports.HtmlDocument = Montage.create(Component, {
         value: null
     },
 
+    exclusionList: {
+        value: ["HTML", "BODY"]
+    },
+
     // Getters for the model.
     // TODO: Change how these properties are accessed through Ninja
     name: {
@@ -42,6 +46,24 @@ exports.HtmlDocument = Montage.create(Component, {
         }
     },
 
+    isActive: {
+        get: function() {
+            return this.model._isActive;
+        },
+        set: function(value) {
+            this.model._isActive = value;
+        }
+    },
+
+    needsSave: {
+        get: function() {
+            return this.model._needsSave;
+        },
+        set: function(value) {
+            this.model._needsSave = value;
+        }
+    },
+
     // View Properties
     // TODO: Move those into a view object - for now dump it here
     iframe: {
@@ -53,6 +75,10 @@ exports.HtmlDocument = Montage.create(Component, {
             return this._uuid;
         }
     },
+
+    currentView: {
+        value: "design"
+    },
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////
     init: {
@@ -270,7 +296,8 @@ exports.HtmlDocument = Montage.create(Component, {
 
                     //TODO Finish this implementation once we start caching Core Elements
                     // Assign a model to the UserContent and add the ViewPort reference to it.
-                    document.application.njUtils.makeElementModel(this.documentRoot, "Stage", "stage");
+                    document.application.njUtils.makeElementModel(this.documentRoot, "Body", "body");
+//                    this.documentRoot.elementModel.props3D.init(this.documentRoot, true);
 
                     for(i = 0; i < this._stylesheets.length; i++) {
                         if(this._stylesheets[i].ownerNode.id === "nj-stage-stylesheet") {
@@ -309,6 +336,23 @@ exports.HtmlDocument = Montage.create(Component, {
         }
     },
 
+    GetElementFromPoint: {
+        value: function(x, y) {
+            return this._window.getElement(x,y);
+        }
+    },
+
+    inExclusion: {
+        value: function(element) {
+            if(this.exclusionList.indexOf(element.nodeName) === -1) {
+                return -1;
+            }
+
+            return 1;
+
+        }
+    },
+
     // Handler for user content main reel. Gets called once the main reel of the template
     // gets deserialized.
     // Setting up the currentSelectedContainer to the document body.
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 3876670c..3dbf96ce 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -759,10 +759,14 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                         //TODO Finish this implementation once we start caching Core Elements
                                         // Assign a model to the UserContent and add the ViewPort reference to it.
                                         NJUtils.makeElementModel(this.documentRoot, "Stage", "stage");
-                                        //this.documentRoot.elementModel.viewPort = this.iframe.contentWindow.document.getElementById("Viewport");
-                                        NJUtils.makeElementModel(this.stageBG, "Stage", "stage");
+                    NJUtils.makeElementModel(this.stageBG, "Stage", "stage");
                                         NJUtils.makeElementModel(this.iframe.contentWindow.document.getElementById("Viewport"), "Stage", "stage");
-                                         
+
+                    // Initialize the 3D properties
+                    this.documentRoot.elementModel.props3D.init(this.documentRoot, true);
+                    this.stageBG.elementModel.props3D.init(this.stageBG, true);
+                    this.iframe.contentWindow.document.getElementById("Viewport").elementModel.props3D.init(this.iframe.contentWindow.document.getElementById("Viewport"), true);
+
                                         for(i = 0; i < this._stylesheets.length; i++) {
                                                 if(this._stylesheets[i].ownerNode.id === this._stageStyleSheetId) {
                                                         this.documentRoot.elementModel.defaultRule = this._stylesheets[i];
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 8925fc40..f237e793 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -25,6 +25,14 @@ exports.BaseDocumentModel = Montage.create(Montage, {
     _name: {
         value: null
     },
+
+    _isActive: {
+        value: null
+    },
+
+    _needsSave: {
+        value: null
+    },
     ////////////////////////////////////////////////////////////////////
         //
         njdata: {
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html
index b3f68030..79c6cd51 100755
--- a/js/document/templates/montage-html/index.html
+++ b/js/document/templates/montage-html/index.html
@@ -24,8 +24,7 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "main.reel",
-                "name": "Main"
+                "prototype": "main.reel"
             }
         }
         </script>
diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css
index db069d4e..08e39f22 100755
--- a/js/document/templates/montage-web/default_html.css
+++ b/js/document/templates/montage-web/default_html.css
@@ -11,7 +11,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 }
 
 .active-element-outline {
-  outline: #adff2f solid 2px;
+    outline: #adff2f solid 2px;
 }
 
 .nj-preset-transition {
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
index 90b0f7fd..630794a4 100755
--- a/js/document/templates/montage-web/index.html
+++ b/js/document/templates/montage-web/index.html
@@ -24,8 +24,7 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "main.reel",
-                "name": "Main"
+                "prototype": "main.reel"
             }
         }
         </script>
@@ -42,7 +41,7 @@
 
         <body>
                 
-                <div>IPSUM</div>
+                <!--<div>IPSUM</div>-->
 
         </body>