diff options
| author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
| commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
| tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/components/layout/tools-list.reel/tools-list.html | |
| parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
| parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
| download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@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 dec37a84..89901426 100755 --- a/js/components/layout/tools-list.reel/tools-list.html +++ b/js/components/layout/tools-list.reel/tools-list.html | |||
| @@ -105,11 +105,7 @@ | |||
| 105 | "element": {"#": "disabledCondition"} | 105 | "element": {"#": "disabledCondition"} |
| 106 | }, | 106 | }, |
| 107 | "bindings": { | 107 | "bindings": { |
| 108 | "condition": { | 108 | "condition": {"<-": "@owner.disabled"} |
| 109 | "boundObject": {"@": "owner"}, | ||
| 110 | "boundObjectPropertyPath": "disabled", | ||
| 111 | "oneway": true | ||
| 112 | } | ||
| 113 | } | 109 | } |
| 114 | }, | 110 | }, |
| 115 | 111 | ||