Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja-internal into serialization

21 files changed, 199 insertions, 89 deletions

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 597577f1..cf7b0685 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -81,7 +81,6 @@ exports.Breadcrumb = Montage.create(Component, {
 
                 // This is always the top container which is now hardcoded to body
                 this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                console.log("this works!");
             }
 
         }
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
new file mode 100755
index 00000000..fbbb7c6e
--- /dev/null
+++ b/js/controllers/elements/body-controller.js
@@ -0,0 +1,44 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+var Montage = require("montage/core/core").Montage,
+    ElementController = require("js/controllers/elements/element-controller").ElementController;
+
+exports.BodyController = Montage.create(ElementController, {
+
+    // TODO - perspective distance needs to be passed in as "dist" and matrix3d needs to be passed in as "mat"
+    set3DProperties: {
+        value: function(el, props, update3DModel) {
+        }
+    },
+
+    getProperty: {
+        value: function(el, p) {
+        }
+    },
+
+    setProperty: {
+        value: function(el, p, value) {
+        }
+    },
+
+    setAttribute: {
+        value: function(el, att, value) {
+        }
+    },
+
+    getPerspectiveDist: {
+        value: function(el) {
+            if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.perspectiveDist) {
+                return el.elementModel.props3D.perspectiveDist;
+            } else {
+                var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, true);
+                el.elementModel.props3D.perspectiveDist = dist;
+                return dist;
+            }
+        }
+    }
+});
diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js
index a772eb16..1bbbbce0 100755
--- a/js/controllers/elements/controller-factory.js
+++ b/js/controllers/elements/controller-factory.js
@@ -6,7 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage         = require("montage/core/core").Montage;
 
-var BlockController = require("js/controllers/elements/block-controller").BlockController,
+var BodyController = require("js/controllers/elements/body-controller").BodyController,
+    BlockController = require("js/controllers/elements/block-controller").BlockController,
     StageController = require("js/controllers/elements/stage-controller").StageController,
     ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
         ImageController = require("js/controllers/elements/image-controller").ImageController,
@@ -27,6 +28,8 @@ exports.ControllerFactory = Montage.create(Montage, {
                     return BlockController;
                 } else if(value.indexOf("stage") !== -1) {
                     return StageController;
+                } else if(value.indexOf("body") !== -1) {
+                    return BodyController;
                 } else if(value.indexOf("shape") !== -1) {
                     return ShapesController;
                 } else if(value.indexOf("canvas") !== -1) {
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 157c54ec..65161b4f 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -9,6 +9,20 @@ var Montage = require("montage/core/core").Montage,
 
 exports.PiData = Montage.create( Montage, {
 
+    bodyPi: {
+        value: [
+            {
+                label: "Style",
+
+                                Section: [
+                                    [
+
+                                    ]
+                                ]
+            }
+        ]
+    },
+
     stagePi: {
         value: [
             {
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;
+
+        }