aboutsummaryrefslogtreecommitdiff
path: root/js/components/radio.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/radio.reel
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/radio.reel')
-rwxr-xr-xjs/components/radio.reel/radio.html5
1 files changed, 2 insertions, 3 deletions
diff --git a/js/components/radio.reel/radio.html b/js/components/radio.reel/radio.html
index 3736ded3..01b76b92 100755
--- a/js/components/radio.reel/radio.html
+++ b/js/components/radio.reel/radio.html
@@ -9,8 +9,7 @@
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10 { 10 {
11 "owner": { 11 "owner": {
12 "module": "js/components/radio.reel", 12 "prototype": "js/components/radio.reel",
13 "name": "Radio",
14 "properties": { 13 "properties": {
15 "element": {"#": "ch_comp"} 14 "element": {"#": "ch_comp"}
16 } 15 }
@@ -19,6 +18,6 @@
19 </script> 18 </script>
20</head> 19</head>
21<body> 20<body>
22 <input id="ch_comp" class="nj-skinned" type="radio"> 21 <input data-montage-id="ch_comp" class="nj-skinned" type="radio">
23</body> 22</body>
24</html> \ No newline at end of file 23</html> \ No newline at end of file