diff options
author | Eric Guzman | 2012-06-20 09:29:12 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-20 09:29:12 -0700 |
commit | e0dc3ff089904653edcf1668e537e1285fd00458 (patch) | |
tree | cd04411fcb7888d1eedaf4aca74737dbd54d5dbe /js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | |
parent | 4bce228aa425fc9b6b9db59518275d248405ed9e (diff) | |
parent | e506b93b285a1666999afe7cf65317cb6552db03 (diff) | |
download | ninja-e0dc3ff089904653edcf1668e537e1285fd00458.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js/stage/binding-view.reel/binding-hud.reel/binding-hud.js')
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js index b03c5a06..fddce11c 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | |||
@@ -20,6 +20,10 @@ exports.BindingHud = Montage.create(Component, { | |||
20 | value: null | 20 | value: null |
21 | }, | 21 | }, |
22 | 22 | ||
23 | boundProperties: { | ||
24 | value: [] | ||
25 | }, | ||
26 | |||
23 | _userComponent: { value: null }, | 27 | _userComponent: { value: null }, |
24 | userComponent: { | 28 | userComponent: { |
25 | get: function() { | 29 | get: function() { |
@@ -32,6 +36,9 @@ exports.BindingHud = Montage.create(Component, { | |||
32 | this.x = val.element.offsetLeft; | 36 | this.x = val.element.offsetLeft; |
33 | this.y = val.element.offsetTop; | 37 | this.y = val.element.offsetTop; |
34 | this.properties = this.application.ninja.objectsController.getPropertiesFromObject(val, true); | 38 | this.properties = this.application.ninja.objectsController.getPropertiesFromObject(val, true); |
39 | this.application.ninja.objectsController.getObjectBindings(this.userComponent).forEach(function(obj) { | ||
40 | this.boundProperties.push(obj.sourceObjectPropertyPath); | ||
41 | }.bind(this)); | ||
35 | this.needsDraw = true; | 42 | this.needsDraw = true; |
36 | } | 43 | } |
37 | } | 44 | } |
@@ -133,7 +140,7 @@ exports.BindingHud = Montage.create(Component, { | |||
133 | // } | 140 | // } |
134 | // this.properties.push({"title":obj, "bound": objBound}); | 141 | // this.properties.push({"title":obj, "bound": objBound}); |
135 | // }.bind(this)); | 142 | // }.bind(this)); |
136 | this.parentComponent.parentComponent.handleShowBinding(this.application.ninja.objectsController.getObjectBindings(this.userComponent)); | 143 | //this.parentComponent.parentComponent.handleShowBinding(this.application.ninja.objectsController.getObjectBindings(this.userComponent)); |
137 | } | 144 | } |
138 | }, | 145 | }, |
139 | 146 | ||