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/components/layout/tool-button.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/components/layout/tool-button.reel')
| -rwxr-xr-x | js/components/layout/tool-button.reel/tool-button.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html index a329f646..936c47ef 100755 --- a/js/components/layout/tool-button.reel/tool-button.html +++ b/js/components/layout/tool-button.reel/tool-button.html | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | "element": {"#": "toolBarButton"} | 18 | "element": {"#": "toolBarButton"} |
| 19 | }, | 19 | }, |
| 20 | "bindings": { | 20 | "bindings": { |
| 21 | "selected": {"<<->": "@owner.data.selected"}, | 21 | "selected": {"<->": "@owner.data.selected"}, |
| 22 | "subselected": {"<-": "@owner.data.subtools.selected"} | 22 | "subselected": {"<-": "@owner.data.subtools.selected"} |
| 23 | } | 23 | } |
| 24 | } | 24 | } |