aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tool-button.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 01:03:59 -0700
committerArmen Kesablyan2012-06-19 01:03:59 -0700
commit2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
treed352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/layout/tool-button.reel
parent244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
downloadninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/layout/tool-button.reel')
-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 }