diff options
author | Armen Kesablyan | 2012-06-18 20:10:48 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-18 20:10:48 -0700 |
commit | 00eb09a626293cb55554e2a8eb7df9a8953b1251 (patch) | |
tree | d9b96adefad798e0ce0409d3947e9626ee5e2385 /js/panels/binding-panel.reel | |
parent | b4ab3e558f26549c63fa0d0a542e208d2be62d56 (diff) | |
parent | 1b2e102b3519994c79b63be44fccb79cf5712fef (diff) | |
download | ninja-00eb09a626293cb55554e2a8eb7df9a8953b1251.tar.gz |
Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding
Diffstat (limited to 'js/panels/binding-panel.reel')
-rw-r--r-- | js/panels/binding-panel.reel/binding-panel.html | 2 | ||||
-rw-r--r-- | js/panels/binding-panel.reel/binding-panel.js | 12 |
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 @@ | |||
74 | <div data-montage-id="binding-panel-toolbar-container" class="binding-panel-toolbar-container"> | 74 | <div data-montage-id="binding-panel-toolbar-container" class="binding-panel-toolbar-container"> |
75 | <div data-montage-id="binding-panel-toolbar"></div> | 75 | <div data-montage-id="binding-panel-toolbar"></div> |
76 | </div> | 76 | </div> |
77 | <div data-montage-id="edit-binding-view" class="edit-binding-view"></div> | 77 | <div data-montage-id="edit-binding-view"></div> |
78 | </div> | 78 | </div> |
79 | </body> | 79 | </body> |
80 | </html> \ No newline at end of file | 80 | </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, { | |||
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 | ||