Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool

Conflicts:
	_scss/compass_app_log.txt
	css/ninja.css

1 files changed, 28 insertions, 20 deletions

diff --git a/node_modules/montage/ui/textarea.reel/textarea.js b/node_modules/montage/ui/textarea.reel/textarea.js
index 44e5f0a5..f812fb97 100755..100644
--- a/node_modules/montage/ui/textarea.reel/textarea.js
+++ b/node_modules/montage/ui/textarea.reel/textarea.js
@@ -3,27 +3,35 @@
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
-/**
-        @module "montage/ui/textarea.reel"
-    @requires montage/core/core
-    @requires montage/ui/editable-text
-*/
+
 var Montage = require("montage").Montage,
-    EditableText = require("ui/editable-text").EditableText;
-/**
-    @class module:"montage/ui/textarea.reel".TextArea
-    @classdesc TextArea component - multiline text field
-    @extends module:montage/ui/editable-text.EditableText
-*/
-exports.TextArea = Montage.create(EditableText, /** @lends module:"montage/ui/textarea.reel".TextArea# */{
-/**
-  Description TODO
-  @private
-*/
-    _drawSpecific: {
-        enumerable: false,
-        value: function() {
-            this.element.classList.add('montage-textarea');
+Component = require("ui/component").Component,
+TextInput = require("ui/text-input").TextInput;
+
+var TextArea = exports.TextArea = Montage.create(TextInput, {
+
+    textContent: {
+        get: function() {
+            return this.value;
+        },
+        set: function(v) {
+            this.value = v;
         }
     }
+
+});
+
+TextArea.addAttributes({
+        autofocus: null,
+        cols: null,
+        dirname: null,
+        disabled: {dataType: 'boolean'},
+        form: null,
+        maxlength: null,
+        name: null,
+        placeholder: null,
+        readonly: {dataType: 'boolean'},
+        required: {dataType: 'boolean'},
+        rows: null,
+        wrap: null
 });