diff options
| author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
| commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
| tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /js/components/layout/tools-list.reel/tools-list.html | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/layout/tools-list.reel/tools-list.html')
| -rwxr-xr-x | js/components/layout/tools-list.reel/tools-list.html | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html index df603bf8..4e5b85ee 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
| @@ -102,11 +102,7 @@ | |||
| 102 | "element": {"#": "disabledCondition"} | 102 | "element": {"#": "disabledCondition"} |
| 103 | }, | 103 | }, |
| 104 | "bindings": { | 104 | "bindings": { |
| 105 | "condition": { | 105 | "condition": {"<-": "@owner.disabled"} |
| 106 | "boundObject": {"@": "owner"}, | ||
| 107 | "boundObjectPropertyPath": "disabled", | ||
| 108 | "oneway": true | ||
| 109 | } | ||
| 110 | } | 106 | } |
| 111 | }, | 107 | }, |
| 112 | 108 | ||