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 /node_modules/montage/ui/radio-button.reel | |
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 'node_modules/montage/ui/radio-button.reel')
-rwxr-xr-x | node_modules/montage/ui/radio-button.reel/radio-button.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/node_modules/montage/ui/radio-button.reel/radio-button.js b/node_modules/montage/ui/radio-button.reel/radio-button.js index 450207a7..817271a2 100755 --- a/node_modules/montage/ui/radio-button.reel/radio-button.js +++ b/node_modules/montage/ui/radio-button.reel/radio-button.js | |||
@@ -15,7 +15,7 @@ var Montage = require("montage").Montage, | |||
15 | /** | 15 | /** |
16 | * Wraps the a <input type="radio"> element with binding support for the element's standard attributes. | 16 | * Wraps the a <input type="radio"> element with binding support for the element's standard attributes. |
17 | @class module:"montage/ui/radio-button.reel".RadioButton | 17 | @class module:"montage/ui/radio-button.reel".RadioButton |
18 | @extends module:montage/check-input.CheckInput | 18 | @extends module:montage/ui/check-input.CheckInput |
19 | */ | 19 | */ |
20 | var RadioButton = exports.RadioButton = Montage.create(CheckInput, { | 20 | var RadioButton = exports.RadioButton = Montage.create(CheckInput, { |
21 | _fakeCheck: { | 21 | _fakeCheck: { |
@@ -83,7 +83,8 @@ var RadioButton = exports.RadioButton = Montage.create(CheckInput, { | |||
83 | RadioButton.addEventListener('checked', this); | 83 | RadioButton.addEventListener('checked', this); |
84 | } | 84 | } |
85 | } | 85 | } |
86 | } | 86 | }, |
87 | serializable: true | ||
87 | }, | 88 | }, |
88 | 89 | ||
89 | 90 | ||