Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

7 files changed, 106 insertions, 129 deletions

diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
index c81b70d3..1c73fd77 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
@@ -23,11 +23,7 @@
                     "element": {"#": "hudRepetition"}
                 },
                 "bindings": {
-                    "objects": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "properties",
-                        "oneway": true
-                    }
+                    "objects": {"<-": "@owner.properties"}
                 }
             },
             "hudOption": {
@@ -36,7 +32,7 @@
                     "element": {"#" : "hudOption"}
                 },
                 "bindings": {
-                    "title": {"<-": "@objectAtCurrentIteration.title"}
+                    "title": {"<-": "@repeater.objectAtCurrentIteration.title"}
                 }
             }
         }
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html
index 152345d4..b77f8e27 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.html
@@ -24,17 +24,16 @@
                     "element": {"#": "hudRepeater"}
                 },
                 "bindings": {
-                    "objects": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "bindables",
-                        "oneway": true
-                    }
+                    "objects": {"<-": "@owner.bindables"}
                 }
             },
             "hud": {
                 "prototype": "js/stage/binding-view.reel/binding-hud.reel",
                 "properties": {
                     "element": {"#" : "hud"}
+                },
+                "bindings": {
+                    "name": {
                 }
             },
             "nonVisualRepeater": {
@@ -43,11 +42,7 @@
                     "element": {"#": "nonVisualRepeater"}
                 },
                 "bindings": {
-                    "objects": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "nonVisualComponents",
-                        "oneway": true
-                    }
+                    "objects": {"<-": "@owner.nonVisualComponents"}
                 }
             },
             "nonVisualComponent": {
@@ -56,16 +51,8 @@
                     "element": {"#": "nonVisualComponent"}
                 },
                 "bindings": {
-                    "objectName": {
-                        "boundObject": {"@": "hudRepeater"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.objectName",
-                        "oneway": true
-                    },
-                    "objectImage": {
-                        "boundObject": {"@": "hudRepeater"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.objectImage",
-                        "oneway": true
-                    }
+                    "objectName": {"<-": "@hudRepeater.objectAtCurrentIteration.objectName"},
+                    "objectImage": {"<-": "@hudRepeater.objectAtCurrentIteration.objectImage"}
                 }
             }
         }
@@ -82,7 +69,9 @@
             </div>
         </div>
         <div data-montage-id="nonVisualRepeater">
-            <div data-montage-id="nonVisualComponent"></div>
+            <div data-montage-id="nonVisualComponent">
+
+            </div>
         </div>
     </section>
 
diff --git a/js/stage/binding-view.reel/binding-view.js b/js/stage/binding-view.reel/binding-view.js
index df3bc3ee..97593c66 100755
--- a/js/stage/binding-view.reel/binding-view.js
+++ b/js/stage/binding-view.reel/binding-view.js
@@ -34,6 +34,7 @@ exports.BindingView = Montage.create(Component, {
         },
         set: function(val) {
             this._selectedElement = val;
+            this.needsDraw = true;
         }
     },
     bindables: {
@@ -51,9 +52,31 @@ exports.BindingView = Montage.create(Component, {
         set: function(val) {
             this._nonVisualComponents = val;
         }
-    }
+    },
 
     //Methods
 
+    //Montage Draw Cycle
+    prepareForDraw: {
+        value: function() {
+
+        }
+    },
+
+    draw: {
+        value: function() {
+            if(this.selectedElement !== null) {
+                this.bindables = [
+                    {"objectName": "Input1", "objectTitle": ""},
+                ]
+            }
+        }
+    },
+
+    didDraw: {
+        value: function() {
+
+        }
+    }
 
 });
\ No newline at end of file
diff --git a/js/stage/layout.js b/js/stage/layout.js
index 9c5e2167..460c8b4a 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -62,12 +62,8 @@ exports.Layout = Montage.create(Component, {
         value: function() {
             // Initial elements to draw are the childrens of the root element
             if(this.application.ninja.documentController.activeDocument.currentView === "design") {
-                this.elementsToDraw = this.application.ninja.documentController.activeDocument.documentRoot.childNodes;
+                this.elementsToDraw = this.application.ninja.documentController.activeDocument.model.documentRoot.childNodes;
             }
-
-            // Draw the elements and the 3d info
-            this.draw();
-            this.draw3DInfo(false);
         }
     },
 
@@ -89,7 +85,7 @@ exports.Layout = Montage.create(Component, {
 
             if(this.application.ninja.documentController.activeDocument.currentView === "design"){
                 // Make an array copy of the line node list which is not an array like object
-                this.domTree = Array.prototype.slice.call(this.application.ninja.documentController.activeDocument._liveNodeList, 0);
+                this.domTree = this.application.ninja.currentDocument.model.views.design.getLiveNodeList(true);
                 // Index of the current container
                 containerIndex = this.domTree.indexOf(this.application.ninja.currentSelectedContainer);
 
@@ -241,7 +237,7 @@ exports.Layout = Montage.create(Component, {
         value: function() {
             if(this.application.ninja.currentDocument) {
                 this.clearCanvas();
-                this.WalkDOM(this.application.ninja.currentDocument.documentRoot);
+                this.WalkDOM(this.application.ninja.currentDocument.model.documentRoot);
 
                 //drawUtils.updatePlanes();
                 //if(this.application.ninja.currentDocument.draw3DGrid) drawUtils.drawWorkingPlane();
@@ -253,7 +249,7 @@ exports.Layout = Montage.create(Component, {
     drawElementsOutline: {
         value: function(elements) {
             this.clearCanvas();
-            this.WalkDOM(this.application.ninja.currentDocument.documentRoot, elements);
+            this.WalkDOM(this.application.ninja.currentDocument.model.documentRoot, elements);
         }
     },
 
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 0d53696b..896d4a5b 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -26,38 +26,10 @@ exports.StageDeps = Montage.create(Component, {
         value: drawUtils
     },