Merge branch 'master' into gh-pages

ericabouaf · Jul 21, 2014 · d59e21e · d59e21e
2 parents 2b987c4 + c50ba49
commit d59e21e
Show file tree

Hide file tree

Showing 40 changed files with 473 additions and 224 deletions.
diff --git a/app-examples/wireit-app/index.html b/app-examples/wireit-app/index.html
@@ -116,7 +116,7 @@ <h2 class="no-toc">Wirings</h2>
 
 YUI({
 	filter: 'raw' // debug
-}).use('wireit-app', 'image-container', 'inout-container', function (Y) {
+}).use('wireit-app', 'image-container', 'inout-container', 'textarea-container', function (Y) {
 
 	window.Y = Y; //debug
 
@@ -164,6 +164,14 @@ <h2 class="no-toc">Wirings</h2>
 						}
 					]
 				}
+			},
+			{
+				name: "TextArea Demo",
+				config: {
+					children: Y.WidgetTerminals.FOUR_EDGES,
+					type: 'TextareaContainer',
+					headerContent: 'Textarea'
+				}
 			}
 		];
 

diff --git a/build/bezier-wire/bezier-wire-coverage.js b/build/bezier-wire/bezier-wire-coverage.js
diff --git a/build/bezier-wire/bezier-wire-debug.js b/build/bezier-wire/bezier-wire-debug.js
@@ -54,7 +54,9 @@ Y.extend(Y.BezierWire, Y.WireBase, {
 
 
 
-   SERIALIZABLE_ATTRS: ["color","width","bezierTangentNorm"]
+   SERIALIZABLE_ATTRS: function() {
+      return ["color","width","bezierTangentNorm"];
+   }
 
 });
 

diff --git a/build/bezier-wire/bezier-wire-min.js b/build/bezier-wire/bezier-wire-min.js
diff --git a/build/bezier-wire/bezier-wire.js b/build/bezier-wire/bezier-wire.js
@@ -54,7 +54,9 @@ Y.extend(Y.BezierWire, Y.WireBase, {
 
 
 
-   SERIALIZABLE_ATTRS: ["color","width","bezierTangentNorm"]
+   SERIALIZABLE_ATTRS: function() {
+      return ["color","width","bezierTangentNorm"];
+   }
 
 });
 

diff --git a/build/container/assets/skins/sam/container-skin.css b/build/container/assets/skins/sam/container-skin.css
@@ -7,7 +7,8 @@
 .yui3-container,
 .yui3-form-container,
 .yui3-image-container,
-.yui3-inout-container {
+.yui3-inout-container,
+.yui3-textarea-container {
 	z-index: 5;
 
 	position: absolute;
@@ -20,7 +21,8 @@
 .yui3-container-content,
 .yui3-form-container-content,
 /*.yui3-image-container-content,*/
-.yui3-inout-container-content {
+.yui3-inout-container-content,
+.yui3-textarea-container-content {
 	border: 2px solid #3366CC;
 
 	-moz-border-radius-topleft: 5px;
@@ -39,7 +41,8 @@
 .yui3-container-content .yui3-widget-hd,
 .yui3-form-container-content .yui3-widget-hd,
 .yui3-inout-container-content .yui3-widget-hd,
-.yui3-image-container-content .yui3-widget-hd {
+.yui3-image-container-content .yui3-widget-hd,
+.yui3-textarea-container-content .yui3-widget-hd {
 	/*-moz-border-radius-topleft: 5px;
 	-moz-border-radius-topright: 5px;
 	-webkit-border-top-left-radius: 5px;
@@ -53,7 +56,8 @@
 .yui3-container-content .yui3-widget-ft,
 .yui3-form-container-content .yui3-widget-ft,
 .yui3-inout-container-content .yui3-widget-ft,
-.yui3-image-container-content .yui3-widget-ft {
+.yui3-image-container-content .yui3-widget-ft,
+.yui3-textarea-container-content .yui3-widget-ft {
 	background-color: #ccc;
 	font-style: italic;
 	font-size: 80%;
@@ -64,7 +68,8 @@
 
 
 .yui3-container-icon,
-.yui3-inout-container-icon {
+.yui3-inout-container-icon,
+.yui3-textarea-container-icon {
 	cursor: pointer;
 	position: absolute;
 	right: 10px;

diff --git a/build/container/assets/skins/sam/container.css b/build/container/assets/skins/sam/container.css