diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/textarea.reel | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
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, |