aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tool-button.reel/tool-button.html
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/components/layout/tool-button.reel/tool-button.html
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/components/layout/tool-button.reel/tool-button.html')
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html2
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 }