diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/components/layout/tool-button.reel/tool-button.html | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/layout/tool-button.reel/tool-button.html')
| -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 | } |