diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/components/radio.reel/radio.html | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/radio.reel/radio.html')
| -rwxr-xr-x | js/components/radio.reel/radio.html | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/js/components/radio.reel/radio.html b/js/components/radio.reel/radio.html index 01b76b92..cee4c369 100755 --- a/js/components/radio.reel/radio.html +++ b/js/components/radio.reel/radio.html | |||
| @@ -11,13 +11,18 @@ | |||
| 11 | "owner": { | 11 | "owner": { |
| 12 | "prototype": "js/components/radio.reel", | 12 | "prototype": "js/components/radio.reel", |
| 13 | "properties": { | 13 | "properties": { |
| 14 | "element": {"#": "ch_comp"} | 14 | "element": {"#": "radio_comp"}, |
| 15 | "labelField": {"#": "labelField"}, | ||
| 16 | "radioField": {"#": "radioField"} | ||
| 15 | } | 17 | } |
| 16 | } | 18 | } |
| 17 | } | 19 | } |
| 18 | </script> | 20 | </script> |
| 19 | </head> | 21 | </head> |
| 20 | <body> | 22 | <body> |
| 21 | <input data-montage-id="ch_comp" class="nj-skinned" type="radio"> | 23 | <div data-montage-id="radio_comp"> |
| 24 | <input data-montage-id="radioField" class="nj-skinned" type="radio"> | ||
| 25 | <label data-montage-id="labelField" class="nj-skinned"></label> | ||
| 26 | </div> | ||
| 22 | </body> | 27 | </body> |
| 23 | </html> \ No newline at end of file | 28 | </html> \ No newline at end of file |