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

7 files changed, 106 insertions, 185 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 3a6f6e97..b8efd432 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -218,7 +218,7 @@ var objectsController = exports.ObjectsController = Montage.create(Montage, {
 
             if(value) {
                 this.currentObjectBindings = this.getObjectBindings(value);
-                console.log("Property list", this.getPropertyList(value, true));
+                //console.log("Property list", this.getPropertyList(value, true));
             } else {
                 this.currentObjectBindings = [];
             }
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
index 18eb11c9..59e070e8 100755
--- a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
+++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js
@@ -30,27 +30,6 @@ exports.BindingHudOption = Montage.create(Component, {
         value: false
     },
 
-    _hudOptions: {
-        value: []
-    },
-
-    hudOptions: {
-        get: function() {
-            return this._hudOptions;
-        },
-        set: function(val) {
-            if (typeof(val) !== "undefined") {
-                this._hudOptions = val;
-                this.title = val.title;
-                this.bound = val.bound;
-            } else {
-                this._hudOptions = null;
-            }
-            this.needsDraw = true;
-
-        }
-    },
-
     prepareForDraw: {
         value: function() {
             // Set Up Listener for click and propagate up to Binding View
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 b8410f9b..82686c7f 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
@@ -33,7 +33,7 @@
                     "element": {"#" : "hudOption"}
                 },
                 "bindings": {
-                    "hudOptions": {"<-": "@repeater.objectAtCurrentIteration"}
+                    "title": {"<-": "@repeater.objectAtCurrentIteration"}
                 }
             },
             "resizer1": {
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
index a8c3ae68..b03c5a06 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
@@ -26,34 +26,18 @@ exports.BindingHud = Montage.create(Component, {
             return this._userComponent;
         },
         set: function(val) {
-            this._userComponent = val;
-        }
-    },
-
-
-    bindingArgs: {
-        get: function() {
-            return this._bindingArgs;
-        },
-        set: function(val) {
             if (typeof(val) !== "undefined") {
-                this._bindingArgs = val;
-                this.userComponent = this.bindingArgs.component;
-                this.title = this.bindingArgs.component.identifier;
-                this.x = this._bindingArgs.component.element.offsetLeft;
-                this.y = this._bindingArgs.component.element.offsetTop;
-                this.properties = this._bindingArgs.properties;
+                this._userComponent = val;
+                this.title = val.identifier;
+                this.x = val.element.offsetLeft;
+                this.y = val.element.offsetTop;
+                this.properties = this.application.ninja.objectsController.getPropertiesFromObject(val, true);
                 this.needsDraw = true;
-            } else {
-                this.properties = [];
             }
         }
     },
 
-    properties: {
-        value: [
-        ]
-    },
+    properties: { value: [] },
 
     _isResizing: {
         value: null
@@ -149,19 +133,20 @@ exports.BindingHud = Montage.create(Component, {
 //                }
 //                this.properties.push({"title":obj, "bound": objBound});
 //            }.bind(this));
+            this.parentComponent.parentComponent.handleShowBinding(this.application.ninja.objectsController.getObjectBindings(this.userComponent));
         }
     },
 
     draw: {
         value: function() {
             this.titleElement.innerHTML = this.title;
-
-//            if(this.isResizing) {
-//                    this.timelineSplitter.collapsed = this.height - this._resizedHeight < 46;
-//                    this.panelSplitter.collapsed = this.width - this._resizedWidth < 30;
-//                }
             this.element.style.top = (this.y + this._resizedY) + "px";
             this.element.style.left = (this.x + this._resizedX) + "px";
         }
+    },
+    didDraw: {
+        value: function() {
+
+        }
     }
 });
\ No newline at end of file
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html
index 01bc3ff7..9eb338d8 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.html
@@ -25,7 +25,7 @@
                     "element": {"#": "hudRepeater"}
                 },
                 "bindings": {
-                    "objects": {"<-": "@owner.bindables"}
+                    "objects": {"<-": "@owner.boundComponents"}
                 }
             },
             "objectsTray" : {
@@ -40,7 +40,7 @@
                     "element": {"#" : "hud"}
                 },
                 "bindings": {
-                    "bindingArgs": {"<-": "@hudRepeater.objectAtCurrentIteration"}
+                    "userComponent": {"<-": "@hudRepeater.objectAtCurrentIteration"}
                 },
                 "listeners": [
                     {
diff --git a/js/stage/binding-view.reel/binding-view.js b/js/stage/binding-view.reel/binding-view.js
index 8c201ba1..aa690ee6 100755
--- a/js/stage/binding-view.reel/binding-view.js
+++ b/js/stage/binding-view.reel/binding-view.js
@@ -13,42 +13,15 @@ var Montage = require("montage/core/core").Montage,
 
 exports.BindingView = Montage.create(Component, {
     //private Properties
+    _canvas: { value:null },
+    _context : { value: null },
+    _targetedElement: {value: null},
+    componentsList: { value: {} },
 
-    hudRepeater: {
-        value: null
-    },
-    _selectedComponent: {
-        value: null
-    },
-
-    //Move variables
-    _translateX : {
-        value: 0
-    },
-
-    _translateY: {
-        value: 0
-    },
-
-    translateX : {
-        get: function() {
-            return this._translateX;
-        },
-        set: function(val) {
-            this._translateX = val;
-        }
-    },
-
-    translateY: {
-        get: function() {
+    hudRepeater: { value: null },