Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 29 insertions, 0 deletions

diff --git a/node_modules/montage/ui/bluemoon/textarea.reel/textarea.js b/node_modules/montage/ui/bluemoon/textarea.reel/textarea.js
new file mode 100644
index 00000000..a5549390
--- /dev/null
+++ b/node_modules/montage/ui/bluemoon/textarea.reel/textarea.js
@@ -0,0 +1,29 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ 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/bluemoon/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/bluemoon/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/bluemoon/textarea.reel".TextArea# */{
+/**
+  Description TODO
+  @private
+*/
+    _drawSpecific: {
+        enumerable: false,
+        value: function() {
+            this.element.classList.add('montage-textarea');
+        }
+    }
+});