aboutsummaryrefslogtreecommitdiff
path: root/js/panels/binding-panel.reel/binding-panel.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-18 19:12:32 -0700
committerArmen Kesablyan2012-06-18 19:12:32 -0700
commit1b2e102b3519994c79b63be44fccb79cf5712fef (patch)
treef38534a7d8a3dc75909419a4bd823db73f771435 /js/panels/binding-panel.reel/binding-panel.js
parent2fcb74d0b204ce2999b70fa9a46fc58a558344d8 (diff)
parente04903ed2d2e6754119550cb071e03878bb1b14b (diff)
downloadninja-1b2e102b3519994c79b63be44fccb79cf5712fef.tar.gz
Merge pull request #16 from ericguzman/binding
Objects Tray - Moved to stage object from binding view
Diffstat (limited to 'js/panels/binding-panel.reel/binding-panel.js')
-rw-r--r--js/panels/binding-panel.reel/binding-panel.js12
1 files changed, 8 insertions, 4 deletions
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, {
64 64
65 handleAddAction : { 65 handleAddAction : {
66 value: function(e) { 66 value: function(e) {
67 var newBindingArgs = { 67 var sourceObject = this.application.ninja.objectsController.currentObject;
68 sourceObject : this.application.ninja.objectsController.currentObject
69 };
70 68
71 this.displayEditView(newBindingArgs); 69 if(sourceObject) {
70 this.displayEditView({
71 sourceObject: sourceObject
72 });
73 } else {
74 this.displayEditView();
75 }
72 } 76 }
73 }, 77 },
74 78