aboutsummaryrefslogtreecommitdiff
path: root/js/components/radio.reel
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/components/radio.reel
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/radio.reel')
-rwxr-xr-xjs/components/radio.reel/radio.js21
1 files changed, 14 insertions, 7 deletions
diff --git a/js/components/radio.reel/radio.js b/js/components/radio.reel/radio.js
index cec4f52e..33fd7e53 100755
--- a/js/components/radio.reel/radio.js
+++ b/js/components/radio.reel/radio.js
@@ -13,11 +13,13 @@ exports.RadioGroup = Montage.create(Component, {
13 }, 13 },
14 14
15 _selectedItem: { 15 _selectedItem: {
16 value: null 16 value: null,
17 serializable: true
17 }, 18 },
18 19
19 selectedIndex: { 20 selectedIndex: {
20 value: null 21 value: null,
22 serializable: true
21 }, 23 },
22 24
23 selectedItem: { 25 selectedItem: {
@@ -55,7 +57,8 @@ exports.RadioGroup = Montage.create(Component, {
55 }, 57 },
56 58
57 name: { 59 name: {
58 value: "RadioGroup0" 60 value: "RadioGroup0",
61 serializable: true
59 }, 62 },
60 63
61 addRadio: 64 addRadio:
@@ -101,15 +104,18 @@ exports.Radio = Montage.create(Component, {
101 }, 104 },
102 105
103 label: { 106 label: {
104 value: null 107 value: null,
108 serializable: true
105 }, 109 },
106 110
107 labelField: { 111 labelField: {
108 value: null 112 value: null,
113 serializable: true
109 }, 114 },
110 115
111 radioField: { 116 radioField: {
112 value: null 117 value: null,
118 serializable: true
113 }, 119 },
114 120
115 _checked: { 121 _checked: {
@@ -118,7 +124,8 @@ exports.Radio = Montage.create(Component, {
118 }, 124 },
119 125
120 group: { 126 group: {
121 value: null 127 value: null,
128 serializable: true
122 }, 129 },
123 130
124 checked: { 131 checked: {