7 files changed, 366 insertions, 39 deletions

diff --git a/js/panels/binding-panel.reel/binding-panel.css b/js/panels/binding-panel.reel/binding-panel.css
index e3dcf140..a1d5be0f 100644
--- a/js/panels/binding-panel.reel/binding-panel.css
+++ b/js/panels/binding-panel.reel/binding-panel.css
@@ -7,9 +7,16 @@
 .binding-panel {
     position: relative;
     height: 100%;
+    display: -webkit-box;
+    overflow: hidden;
+    -webkit-box-orient: vertical;
 }
 
 .bindings-list {
+    -webkit-box-flex: 1;
     padding: 0;
     margin: 0;
 }
+.binding-panel-toolbar-container {
+    -webkit-box-flex: 0;
+}
diff --git a/js/panels/binding-panel.reel/binding-panel.html b/js/panels/binding-panel.reel/binding-panel.html
index a926da8d..9a2834c7 100644
--- a/js/panels/binding-panel.reel/binding-panel.html
+++ b/js/panels/binding-panel.reel/binding-panel.html
@@ -36,6 +36,7 @@
                     "element": {"#": "binding-item"}
                 },
                 "bindings": {
+                    "bindingArgs": {"<-": "@repetition.objectAtCurrentIteration"},
                     "sourceObjectPropertyPath": {"<-": "@repetition.objectAtCurrentIteration.sourceObjectPropertyPath"},
                     "sourceObject": {"<-": "@repetition.objectAtCurrentIteration.sourceObject"},
                     "boundObjectPropertyPath": {"<-": "@repetition.objectAtCurrentIteration.boundObjectPropertyPath"},
@@ -48,8 +49,20 @@
                 "properties": {
                     "element": {"#": "edit-binding-view" }
                 }
+            },
+            "toolbar": {
+                "prototype": "js/components/toolbar.reel",
+                "properties": {
+                    "element": {"#": "binding-panel-toolbar"},
+                    "delegate": {"@": "owner" },
+                    "buttons": [
+                        {
+                            "title": "Add",
+                            "identifier": "add"
+                        }
+                    ]
+                }
             }
-
         }
                 </script>
         </head>
@@ -58,6 +71,9 @@
         <ul data-montage-id="bindings-list" class="bindings-list">
             <li data-montage-id="binding-item" class="binding-item"></li>
         </ul>
+        <div data-montage-id="binding-panel-toolbar-container" class="binding-panel-toolbar-container">
+            <div data-montage-id="binding-panel-toolbar"></div>
+        </div>
         <div data-montage-id="edit-binding-view" class="edit-binding-view"></div>
     </div>
 </body>
diff --git a/js/panels/binding-panel.reel/binding-panel.js b/js/panels/binding-panel.reel/binding-panel.js
index c2ce556c..0641ecf5 100644
--- a/js/panels/binding-panel.reel/binding-panel.js
+++ b/js/panels/binding-panel.reel/binding-panel.js
@@ -6,7 +6,6 @@ exports.BindingPanel = Montage.create(Component, {
 
     bindings : { value: null },
     editView : { value: null },
-    editingClass : { value: 'editing-binding' },
     _editing: { value: null },
     editing: {
         get: function() {
@@ -24,14 +23,27 @@ exports.BindingPanel = Montage.create(Component, {
 
     displayEditView : {
         value: function(bindingArgs) {
+            this.editView.bindingArgs = bindingArgs;
             this.editing = true;
         }
     },
 
     /* -------------------------
-        Draw Cycle
+     Toolbar Button Actions
      ------------------------- */
 
+    handleAddAction : {
+        value: function(e) {
+            var newBindingArgs = {
+                sourceObject : this.application.ninja.objectsController.currentObject
+            };
+
+            this.displayEditView(newBindingArgs);
+        }
+    },
+
+
+
     templateDidLoad : {
         value: function() {
             Object.defineBinding(this, 'bindings', {
@@ -56,8 +68,10 @@ exports.BindingPanel = Montage.create(Component, {
 
             if(this.editing) {
                 this.editView.element.style.setProperty(transStr, 'translate3d(-'+ this._translateDistance + 'px,0,0)');
+                this.editView.element.style.setProperty('box-shadow', '0 0 10px rgba(0,0,0,0.2)')
             } else {
                 this.editView.element.style.removeProperty(transStr);
+                this.editView.element.style.removeProperty('box-shadow');
             }
         }
     }
diff --git a/js/panels/binding/binding-item.reel/binding-item.js b/js/panels/binding/binding-item.reel/binding-item.js
index 55230fc3..a1017020 100644
--- a/js/panels/binding/binding-item.reel/binding-item.js
+++ b/js/panels/binding/binding-item.reel/binding-item.js
@@ -12,6 +12,10 @@ exports.BindingItem = Montage.create(Component, {
     sourceObjectLabel : { value: null },
     boundObjectLabel : { value: null },
 
+    bindingArgs : {
+        value: null
+    },
+
     _sourceObject : { value: null },
     sourceObject : {
         get: function() {
@@ -73,7 +77,9 @@ exports.BindingItem = Montage.create(Component, {
         },
         set: function(value) {
             if(value === this._oneway) { return; }
+
             this._oneway = value;
+
             this.needsDraw = true;
         }
     },
@@ -82,13 +88,19 @@ exports.BindingItem = Montage.create(Component, {
 
     handleDirectionToggleButtonAction : {
         value: function(e) {
+            var controller = this.application.ninja.objectsController;
+
             this.oneway = !this.oneway;
+            controller.editBinding(this.bindingArgs, {
+                oneway: !this.bindingArgs.oneway
+            });
+            controller.currentItem = controller.currentItem;
         }
     },
 
     handleEditButtonAction : {
         value: function(e) {
-            this.parentComponent.parentComponent.displayEditView();
+            this.parentComponent.parentComponent.displayEditView(this.bindingArgs);
         }
     },
 
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 b0249c6c..aa539cd6 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
@@ -9,11 +9,14 @@
     color: #FFF;
     font-size: 11px;
     height: 100%;
-    /*left: 100%;*/
-    /*position: absolute;*/
-    /*top: 0;*/
+    left: 100%;
+    position: absolute;
+    top: 0;
     width: 100%;
-    -webkit-transition: -webkit-transform 140ms ease-in;
+    -webkit-transition-property: -webkit-transform, box-shadow;
+    -webkit-transition-duration: .55s, .2s;
+    -webkit-transition-timing-function: cubic-bezier(.44,.19,0,.99);
+    -webkit-user-select: text;