diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/stage/binding-view.reel/binding-hud.reel | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/stage/binding-view.reel/binding-hud.reel')
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | 12 |
1 files changed, 12 insertions, 0 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 799c5866..a8c3ae68 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,17 @@ exports.BindingHud = Montage.create(Component, { | |||
20 | value: null | 20 | value: null |
21 | }, | 21 | }, |
22 | 22 | ||
23 | _userComponent: { value: null }, | ||
24 | userComponent: { | ||
25 | get: function() { | ||
26 | return this._userComponent; | ||
27 | }, | ||
28 | set: function(val) { | ||
29 | this._userComponent = val; | ||
30 | } | ||
31 | }, | ||
32 | |||
33 | |||
23 | bindingArgs: { | 34 | bindingArgs: { |
24 | get: function() { | 35 | get: function() { |
25 | return this._bindingArgs; | 36 | return this._bindingArgs; |
@@ -27,6 +38,7 @@ exports.BindingHud = Montage.create(Component, { | |||
27 | set: function(val) { | 38 | set: function(val) { |
28 | if (typeof(val) !== "undefined") { | 39 | if (typeof(val) !== "undefined") { |
29 | this._bindingArgs = val; | 40 | this._bindingArgs = val; |
41 | this.userComponent = this.bindingArgs.component; | ||
30 | this.title = this.bindingArgs.component.identifier; | 42 | this.title = this.bindingArgs.component.identifier; |
31 | this.x = this._bindingArgs.component.element.offsetLeft; | 43 | this.x = this._bindingArgs.component.element.offsetLeft; |
32 | this.y = this._bindingArgs.component.element.offsetTop; | 44 | this.y = this._bindingArgs.component.element.offsetTop; |