diff options
author | Nivesh Rajbhandari | 2012-04-18 13:49:26 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-18 13:49:26 -0700 |
commit | e6bdea62cff68837239c1be579926693c1aa7bdf (patch) | |
tree | bddf63c8b1fc493ec64aca642b8887321674bb16 /node_modules/montage/ui/textarea.reel | |
parent | 7b3ef287f248c07602aefa3ba2cc907e0d16493a (diff) | |
parent | 2e04af953463643791f6362bd8ef4c6ba190abfa (diff) | |
download | ninja-e6bdea62cff68837239c1be579926693c1aa7bdf.tar.gz |
Merge branch 'refs/heads/ninja-internal' into EricMerge
Diffstat (limited to 'node_modules/montage/ui/textarea.reel')
-rw-r--r-- | node_modules/montage/ui/textarea.reel/textarea.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/ui/textarea.reel/textarea.js b/node_modules/montage/ui/textarea.reel/textarea.js index 5cba6532..70d88660 100644 --- a/node_modules/montage/ui/textarea.reel/textarea.js +++ b/node_modules/montage/ui/textarea.reel/textarea.js | |||
@@ -8,7 +8,7 @@ var Montage = require("montage").Montage, | |||
8 | Component = require("ui/component").Component, | 8 | Component = require("ui/component").Component, |
9 | TextInput = require("ui/text-input").TextInput; | 9 | TextInput = require("ui/text-input").TextInput; |
10 | 10 | ||
11 | var TextArea = exports.TextArea = Montage.create(TextInput, { | 11 | var Textarea = exports.Textarea = Montage.create(TextInput, { |
12 | 12 | ||
13 | textContent: { | 13 | textContent: { |
14 | get: function() { | 14 | get: function() { |
@@ -21,7 +21,7 @@ var TextArea = exports.TextArea = Montage.create(TextInput, { | |||
21 | 21 | ||
22 | }); | 22 | }); |
23 | 23 | ||
24 | TextArea.addAttributes({ | 24 | Textarea.addAttributes({ |
25 | autofocus: {dataType: 'boolean'}, | 25 | autofocus: {dataType: 'boolean'}, |
26 | cols: null, | 26 | cols: null, |
27 | dirname: null, | 27 | dirname: null, |