diff options
| author | hwc487 | 2012-05-31 17:11:08 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-31 17:11:08 -0700 |
| commit | 1c445cf5d905f79937998cf2f1115594ea8c1074 (patch) | |
| tree | 35271ad7ffec86fde9102af3dd954fa3a2974582 /js/components/checkbox.reel/checkbox.html | |
| parent | 335ce503996e3ccbd2909086328d0a31fbd03370 (diff) | |
| parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
| download | ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/io/system/ninjalibrary.json
Diffstat (limited to 'js/components/checkbox.reel/checkbox.html')
| -rwxr-xr-x | js/components/checkbox.reel/checkbox.html | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html deleted file mode 100755 index ded91fc2..00000000 --- a/js/components/checkbox.reel/checkbox.html +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html> | ||
| 8 | <head> | ||
| 9 | <script type="text/montage-serialization"> | ||
| 10 | { | ||
| 11 | "owner": { | ||
| 12 | "prototype": "js/components/checkbox.reel", | ||
| 13 | "properties": { | ||
| 14 | "element": {"#": "ch_comp"} | ||
| 15 | } | ||
| 16 | } | ||
| 17 | } | ||
| 18 | </script> | ||
| 19 | </head> | ||
| 20 | <body> | ||
| 21 | <input data-montage-id="ch_comp" class="nj-skinned" type="checkbox"> | ||
| 22 | </body> | ||
| 23 | </html> \ No newline at end of file | ||