diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/layout/tool-button.reel | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
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 | } |