Merge pull request #16 from ericguzman/binding

Objects Tray - Moved to stage object from binding view

2 files changed, 9 insertions, 5 deletions

diff --git a/js/panels/binding-panel.reel/binding-panel.html b/js/panels/binding-panel.reel/binding-panel.html
index 9a2834c7..fc80cd6e 100644
--- a/js/panels/binding-panel.reel/binding-panel.html
+++ b/js/panels/binding-panel.reel/binding-panel.html
@@ -74,7 +74,7 @@
         <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 data-montage-id="edit-binding-view"></div>
     </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/js/panels/binding-panel.reel/binding-panel.js b/js/panels/binding-panel.reel/binding-panel.js
index 45fa4005..c040c009 100644
--- a/js/panels/binding-panel.reel/binding-panel.js
+++ b/js/panels/binding-panel.reel/binding-panel.js
@@ -64,11 +64,15 @@ exports.BindingPanel = Montage.create(Component, {
 
     handleAddAction : {
         value: function(e) {
-            var newBindingArgs = {
-                sourceObject : this.application.ninja.objectsController.currentObject
-            };
+            var sourceObject = this.application.ninja.objectsController.currentObject;
 
-            this.displayEditView(newBindingArgs);
+            if(sourceObject) {
+                this.displayEditView({
+                    sourceObject: sourceObject
+                });
+            } else {
+                this.displayEditView();
+            }
         }
     },