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/check-input.js | |
| 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/check-input.js')
| -rw-r--r-- | node_modules/montage/ui/check-input.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/ui/check-input.js b/node_modules/montage/ui/check-input.js index aeba7a86..efbaa542 100644 --- a/node_modules/montage/ui/check-input.js +++ b/node_modules/montage/ui/check-input.js | |||
| @@ -18,9 +18,9 @@ var Montage = require("montage").Montage, | |||
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | The base class for the Checkbox component. You will not typically create this class directly but instead use the Checkbox component. | 20 | The base class for the Checkbox component. You will not typically create this class directly but instead use the Checkbox component. |
| 21 | @class module:montage/ui/text-input.CheckInput | 21 | @class module:montage/ui/check-input.CheckInput |
| 22 | @extends module:montage/ui/native-control.NativeControl | 22 | @extends module:montage/ui/native-control.NativeControl |
| 23 | @see module:"montage/ui/checkbox.reel".CheckBox | 23 | @see module:"montage/ui/input-checkbox.reel".CheckBox |
| 24 | */ | 24 | */ |
| 25 | var CheckInput = exports.CheckInput = Montage.create(NativeControl, { | 25 | var CheckInput = exports.CheckInput = Montage.create(NativeControl, { |
| 26 | 26 | ||