diff options
| author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
| commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
| tree | e408be732a3eee71229bfc7dbf7cace998ce18de /js/components/ui | |
| parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
| parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
| download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/ui')
| -rwxr-xr-x | js/components/ui/label-checkbox.reel/label-checkbox.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/ui/label-checkbox.reel/label-checkbox.html b/js/components/ui/label-checkbox.reel/label-checkbox.html index 0efc7ae0..d39fca9b 100755 --- a/js/components/ui/label-checkbox.reel/label-checkbox.html +++ b/js/components/ui/label-checkbox.reel/label-checkbox.html | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | }, | 20 | }, |
| 21 | 21 | ||
| 22 | "checkbox": { | 22 | "checkbox": { |
| 23 | "prototype": "montage/ui/checkbox.reel", | 23 | "prototype": "montage/ui/input-checkbox.reel", |
| 24 | "properties": { | 24 | "properties": { |
| 25 | "element": {"#": "checkbox"}, | 25 | "element": {"#": "checkbox"}, |
| 26 | "checked": false | 26 | "checked": false |