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/text-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/text-input.js')
-rw-r--r-- | node_modules/montage/ui/text-input.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/node_modules/montage/ui/text-input.js b/node_modules/montage/ui/text-input.js index 483a8126..26ed8cab 100644 --- a/node_modules/montage/ui/text-input.js +++ b/node_modules/montage/ui/text-input.js | |||
@@ -18,10 +18,10 @@ var Montage = require("montage").Montage, | |||
18 | The base class for all text-based input components. You typically won't create instances of this prototype. | 18 | The base class for all text-based input components. You typically won't create instances of this prototype. |
19 | @class module:montage/ui/text-input.TextInput | 19 | @class module:montage/ui/text-input.TextInput |
20 | @extends module:montage/ui/native-control.NativeControl | 20 | @extends module:montage/ui/native-control.NativeControl |
21 | @see module:"montage/ui/date-input.reel".DateInput | 21 | @see module:"montage/ui/input-date.reel".DateInput |
22 | @see module:"montage/ui/textfield.reel".Textfield | 22 | @see module:"montage/ui/input-text.reel".InputText |
23 | @see module:"montage/ui/number-input.reel".NumberInput | 23 | @see module:"montage/ui/input-number.reel".InputNumber |
24 | @see module:"montage/ui/range-input.reel".RangeInput | 24 | @see module:"montage/ui/input-range.reel".RangeInput |
25 | @see module:"montage/ui/textarea.reel".TextArea | 25 | @see module:"montage/ui/textarea.reel".TextArea |
26 | 26 | ||
27 | */ | 27 | */ |