fix conflicts

[roojs1] / docs / symbols / Roo.form.TextArea.json

diff --git a/docs/symbols/Roo.form.TextArea.json b/docs/symbols/Roo.form.TextArea.json
index 9baefd8..7a1683c 100644 (file)
--- a/docs/symbols/Roo.form.TextArea.json
+++ b/docs/symbols/Roo.form.TextArea.json
@@ -112,6 +112,14 @@
       "isOptional" : false,
       "optvals" : []
     },
+    {
+      "name" : "style",
+      "type" : "String",
+      "desc" : "css styles to add to component\neg. text-align:right;",
+      "memberOf" : "Roo.Component",
+      "isOptional" : false,
+      "optvals" : []
+    },
     {
       "name" : "value",
       "type" : "Mixed",
@@ -201,17 +209,25 @@
       "optvals" : []
     },
     {
-      "name" : "validateOnBlur",
-      "type" : "Boolean",
-      "desc" : "Whether the field should validate when it loses focus (defaults to true).",
+      "name" : "cls",
+      "type" : "String",
+      "desc" : "A CSS class to apply to the field's underlying element.",
       "memberOf" : "Roo.form.Field",
       "isOptional" : false,
       "optvals" : []
     },
     {
-      "name" : "cls",
+      "name" : "labelSeparator",
       "type" : "String",
-      "desc" : "A CSS class to apply to the field's underlying element.",
+      "desc" : "the ':' after a field label (default :)  = set it to empty string to hide the field label.",
+      "memberOf" : "Roo.form.Field",
+      "isOptional" : false,
+      "optvals" : []
+    },
+    {
+      "name" : "validateOnBlur",
+      "type" : "Boolean",
+      "desc" : "Whether the field should validate when it loses focus (defaults to true).",
       "memberOf" : "Roo.form.Field",
       "isOptional" : false,
       "optvals" : []