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

7 files changed, 178 insertions, 68 deletions

diff --git a/js/controllers/objects-controller.js b/js/controllers/objects-controller.js
index 386ef683..877f7f9f 100644
--- a/js/controllers/objects-controller.js
+++ b/js/controllers/objects-controller.js
@@ -66,7 +66,7 @@ var objectsController = exports.ObjectsController = Montage.create(Component, {
             if(!bindingArgs.sourceObject || !bindingArgs.sourceObjectPropertyPath || !bindingArgs) { return; }
 
             Object.defineBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath, bindingArgs);
-            this.currentObjectBindings = this.getObjectBindings(value);
+            this.currentObjectBindings = this.getObjectBindings(bindingArgs.sourceObject);
         }
     },
 
@@ -77,7 +77,7 @@ var objectsController = exports.ObjectsController = Montage.create(Component, {
 
 
             Object.deleteBinding(bindingArgs.sourceObject, bindingArgs.sourceObjectPropertyPath);
-            this.currentObjectBindings = this.getObjectBindings(value);
+            this.currentObjectBindings = this.getObjectBindings(bindingArgs.sourceObject);
         }
     },
 
diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.css b/js/panels/binding/edit-binding-view.reel/edit-binding-view.css
index 23585aca..01feb5cc 100644
--- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.css
+++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.css
@@ -33,7 +33,6 @@
     display: -webkit-box;
     -webkit-box-orient: horizontal;
     -webkit-box-flex: 1;
-    overflow: hidden;
 }
 .object-container:first-child {
     margin-right: 5px;
@@ -47,10 +46,7 @@
     width: 40px;
     -webkit-box-flex: 0;
 }
-.object-icon-container > div {
-    height: 100%;
-    width: 100%;
-}
+
 .edit-object-binding .object-icon {
     -webkit-transform: scale(.75);
     height: 100%;
@@ -93,8 +89,9 @@
 
 .buttons-container {
     background-color: #474747;
+    padding: 5px 0;
     position: absolute;
-    bottom: 5px;
+    bottom: 0;
     width: 100%;
 }
 
diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html
index e2cbdd1d..91a5426f 100644
--- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html
+++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html
@@ -21,7 +21,9 @@
                     "directionCheckbox"  : {"@": "directionCheckbox" },
                     "saveButton":{ "@": "saveButton" },
                     "cancelButton":{ "@": "cancelButton" },
-                    "deleteButton":{ "@": "deleteButton" }
+                    "deleteButton":{ "@": "deleteButton" },
+                    "sourceObjectIconElement": {"#": "source-object-icon"},
+                    "boundObjectIconElement": {"#": "bound-object-icon"}
                 }
             },
             "sourceObjectField": {
@@ -31,7 +33,7 @@
                     "element": {"#": "sourceObjectField"}
                 },
                 "bindings": {
-                    "value": {"<-": "@owner.sourceObjectIdentifier"}
+                    "value": {"<<->": "@owner.sourceObjectIdentifier"}
                 },
                 "listeners" : [
                     {
@@ -47,7 +49,7 @@
                     "element": {"#": "boundObjectField"}
                 },
                 "bindings": {
-                    "value": {"<-": "@owner.boundObjectIdentifier"}
+                    "value": {"<<->": "@owner.boundObjectIdentifier"}
                 },
                 "listeners" : [
                     {
@@ -64,7 +66,7 @@
                     "identifier": "sourceProperty"
                 },
                 "bindings": {
-                    "value": {"<-": "@owner.sourceObjectPropertyPath"}
+                    "value": {"<<->": "@owner.sourceObjectPropertyPath"}
                 },
                 "listeners" : [
                     {
@@ -81,7 +83,7 @@
                     "identifier": "boundProperty"
                 },
                 "bindings": {
-                    "value": {"<-": "@owner.boundObjectPropertyPath"}
+                    "value": {"<<->": "@owner.boundObjectPropertyPath"}
                 },
                 "listeners" : [
                     {
@@ -147,14 +149,10 @@
 </head>
 <body>
 <div data-montage-id="edit-binding" class="edit-binding-view">
-
-
     <section class="edit-object-binding">
         <div data-montage-id="source-object-container" class="object-container">
             <div data-montage-id="source-object-icon-container" class="object-icon-container">
-                <div>
-                    <div class="object-icon"></div>
-                </div>
+                <div data-montage-id="source-object-icon" class="object-icon"></div>
             </div>
             <div class="object-fields-container">
                 <span data-montage-id="sourceObjectField" class="hintable-field">Test</span>
@@ -164,9 +162,7 @@
 
         <div data-montage-id="bound-object-container" class="object-container">
             <div data-montage-id="bound-object-icon-container" class="object-icon-container">
-                <div>
-                    <div class="object-icon"></div>
-                </div>
+                <div data-montage-id="bound-object-icon" class="object-icon"></div>
             </div>
             <div class="object-fields-container">
                 <span data-montage-id="boundObjectField" class="hintable-field">Test</span>
@@ -175,12 +171,10 @@
         </div>
     </section>
 
-
     <div class="checkbox-container">
         <input data-montage-id="direction-checkbox" type="checkbox" class="nj-skinned"><label>Oneway</label>
     </div>
 
-
     <div class="buttons-container">
         <button data-montage-id="delete-button" class="nj-skinned btn-delete">Delete</button>
         <button data-montage-id="save-button" class="nj-skinned btn-save">Save</button>
diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.js b/js/panels/binding/edit-binding-view.reel/edit-binding-view.js
index 10f427af..62a47aaf 100644
--- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.js
+++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.js
@@ -5,10 +5,13 @@
  </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
+    Component = require("montage/ui/component").Component,
+    Converter = require("montage/core/converter/converter").Converter;
 
 
-exports.EditBindingView = Montage.create(Component, {
+var editBindingView = exports.EditBindingView = Montage.create(Component, {
+    sourceObjectIconElement : { value: null },
+    boundObjectIconElement  : { value: null },