fix conflicts

[roojs1] / docs / symbols / Roo.bootstrap.form.TimeField.json

diff --git a/docs/symbols/Roo.bootstrap.form.TimeField.json b/docs/symbols/Roo.bootstrap.form.TimeField.json
index 960895f..a9290f9 100644 (file)
--- a/docs/symbols/Roo.bootstrap.form.TimeField.json
+++ b/docs/symbols/Roo.bootstrap.form.TimeField.json
@@ -95,6 +95,14 @@
       "isOptional" : false,
       "optvals" : []
     },
+    {
+      "name" : "minuteStep",
+      "type" : "Number",
+      "desc" : "the minutes is always the multiple of a fixed number, default 1",
+      "memberOf" : "",
+      "isOptional" : false,
+      "optvals" : []
+    },
     {
       "name" : "xattr",
       "type" : "Object",
@@ -284,14 +292,6 @@
         "right"
       ]
     },
-    {
-      "name" : "focusClass",
-      "type" : "String",
-      "desc" : "The CSS class to use when the field receives focus (defaults to \"x-form-focus\")",
-      "memberOf" : "Roo.bootstrap.form.Input",
-      "isOptional" : false,
-      "optvals" : []
-    },
     {
       "name" : "size",
       "type" : "string",
@@ -308,6 +308,14 @@
       "isOptional" : false,
       "optvals" : []
     },
+    {
+      "name" : "focusClass",
+      "type" : "String",
+      "desc" : "The CSS class to use when the field receives focus (defaults to \"x-form-focus\")",
+      "memberOf" : "Roo.bootstrap.form.Input",
+      "isOptional" : false,
+      "optvals" : []
+    },
     {
       "name" : "labelxs",
       "type" : "Number",
@@ -745,6 +753,25 @@
       "params" : [],
       "returns" : []
     },
+    {
+      "name" : "getAutoCreateLabel",
+      "type" : "function",
+      "desc" : "autocreate the label - also used by textara... ?? and others?",
+      "sig" : "()\n{\n\n}",
+      "static" : false,
+      "memberOf" : "Roo.bootstrap.form.Input",
+      "isStatic" : false,
+      "isConstructor" : false,
+      "isPrivate" : false,
+      "example" : "",
+      "deprecated" : "",
+      "since" : "",
+      "see" : "",
+      "exceptions" : "",
+      "requires" : "",
+      "params" : [],
+      "returns" : []
+    },
     {
       "name" : "validate",
       "type" : "function",