1 files changed, 45 insertions, 38 deletions

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 62a47aaf..46fe9681 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
@@ -65,6 +65,10 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, {
 
             this._sourceObject = value;
 
+            if(value) {
+                this.sourceObjectPropertyPathField.hints = this.application.ninja.objectsController.getPropertiesFromObject(value);
+            }
+
             this.needsDraw = true;
         }
     },
@@ -74,9 +78,12 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, {
         get : function() { return this._boundObject; },
         set : function(value) {
             if(value === this._boundObject) { return; }
-            console.log("Bound Object being set to ", value);
             this._boundObject = value;
 
+            if(value) {
+                this.boundObjectPropertyPathField.hints = this.application.ninja.objectsController.getPropertiesFromObject(value);
+            }
+
             this.needsDraw = true;
         }
     },
@@ -85,12 +92,8 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, {
     sourceObjectPropertyPath : {
         get : function() { return this._sourceObjectPropertyPath; },
         set : function(value) {
-            console.log("Source Object Property Path being set to ", value);
-
             if(value === this._sourceObjectPropertyPath) { return; }
 
-
-
             this._sourceObjectPropertyPath = value;
 
             this.needsDraw = true;
@@ -144,26 +147,27 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, {
             // clear form values
             this.clearForm();
 
-            // set up hints for hintable components
-            this.objectIdentifiers = this.getObjectIdentifiers();
-            console.log("setting hints to ", this.objectIdentifiers);
-            this.boundObjectField.hints = this.objectIdentifiers;
-            this.sourceObjectField.hints = this.objectIdentifiers;
+            if(value) {
+                // set up hints for hintable components
+                this.objectIdentifiers = this.getObjectIdentifiers();
+                this.boundObjectField.hints = this.objectIdentifiers;
+                this.sourceObjectField.hints = this.objectIdentifiers;
 
-            if(value.sourceObject) {
-                this.sourceObjectIdentifier = value.sourceObject.identifier || value.sourceObject._montage_metadata.label;
-                this.sourceObjectPropertyPath = value.sourceObjectPropertyPath || '';
-            }
+                if(value.sourceObject) {
+                    this.sourceObjectIdentifier = value.sourceObject.identifier || value.sourceObject._montage_metadata.label;
+                    this.sourceObjectPropertyPath = value.sourceObjectPropertyPath || '';
+                }
 
-            if(value.boundObject) {
-                this.boundObjectIdentifier = value.boundObject.identifier || '';
-                this.boundObjectPropertyPath = value.boundObjectPropertyPath || '';
-                this.isNewBinding = false;
-            } else {
-                this.isNewBinding = true;
-            }
+                if(value.boundObject) {
+                    this.boundObjectIdentifier = value.boundObject.identifier || '';
+                    this.boundObjectPropertyPath = value.boundObjectPropertyPath || '';
+                    this.isNewBinding = false;
+                } else {
+                    this.isNewBinding = true;
+                }
 
-            this.oneway = value.oneway;
+                this.oneway = value.oneway;
+            }
 
             this.needsDraw = true;
         }
@@ -187,25 +191,29 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, {
 
     clearForm : {
         value: function() {
-            for(var field in this) {
-                if(this.hasOwnProperty(field)) {
-                    field.value = '';
-                }
-            }
+            var fields = ["sourceObjectField",
+                          "boundObjectField",
+                          "sourceObjectPropertyPathField",
+                          "boundObjectPropertyPathField"];
+
+            fields.forEach(function(fieldName) {
+                this[fieldName].value = "";
+            }, this);
+
+            this._bindingArgs = null;
+
             this.dirty = false;
         }
     },
 
     saveForm : {
         value: function() {
-            debugger;
-
             var controller = this.application.ninja.objectsController,
                 newBindingArgs = {
                     sourceObject             : this.sourceObject,
-                    sourceObjectPropertyPath : this.sourceObjectPropertyPathField.value, // TODO: shouldn't need to do this (get from bound property)
+                    sourceObjectPropertyPath : this.sourceObjectPropertyPath,
                     boundObject              : this.boundObject,
-                    boundObjectPropertyPath  : this.boundObjectPropertyPathField.value, // TODO: shouldn't need to do this
+                    boundObjectPropertyPath  : this.boundObjectPropertyPath,
                     oneway: this.oneway
             };
 
@@ -273,8 +281,6 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, {
 
     templateDidLoad : {
         value: function() {
-
-
             Object.defineBinding(this, 'sourceObject', {
                 boundObject: this,
                 boundObjectPropertyPath: 'sourceObjectIdentifier',
@@ -288,7 +294,6 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, {
                 oneway: false,
                 converter : objectIdentifierConverter.create()
             });
-
         }
     },
 
@@ -304,23 +309,26 @@ var editBindingView = exports.EditBindingView = Montage.create(Component, {
                 controller = this.application.ninja.objectsController,
                 category;
 
-            this.sourceObjectIconElement.className = defaultIconClass;
-            this.boundObjectIconElement.className = defaultIconClass;
-
             if(this.sourceObject) {
+                this.sourceObjectIconElement.classList.remove('no-object');
                 category = controller.getObjectCategory(this.sourceObject).toLowerCase();
 
                 if(category) {
                     this.sourceObjectIconElement.classList.add('object-icon-'+category);
                 }
+            } else {
+                this.sourceObjectIconElement.classList.add('no-object');
             }
 
             if(this.boundObject) {
+                this.boundObjectIconElement.classList.remove('no-object');
                 category = controller.getObjectCategory(this.boundObject).toLowerCase() || null;
 
                 if(category) {
                     this.boundObjectIconElement.classList.add('object-icon-'+category);
                 }
+            } else {
+                this.boundObjectIconElement.classList.add('no-object');
             }
         }
     }
@@ -339,7 +347,6 @@ var objectIdentifierConverter = exports.ObjectIdentifierConverter = Montage.crea
     },