fix conflicts

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

diff --git a/docs/symbols/Roo.bootstrap.form.SecurePass.json b/docs/symbols/Roo.bootstrap.form.SecurePass.json
index 76fd9ee..56c2f8f 100644 (file)
--- a/docs/symbols/Roo.bootstrap.form.SecurePass.json
+++ b/docs/symbols/Roo.bootstrap.form.SecurePass.json
@@ -162,14 +162,6 @@
       "isOptional" : false,
       "optvals" : []
     },
-    {
-      "name" : "errors",
-      "type" : "String/Object",
-      "desc" : "A Error spec, or true for a default spec (defaults to\n{\n PwdEmpty: \"Please type a password, and then retype it to confirm.\",\n PwdShort: \"Your password must be at least 6 characters long. Please type a different password.\",\n PwdLong: \"Your password can't contain more than 16 characters. Please type a different password.\",\n PwdBadChar: \"The password contains characters that aren't allowed. Please type a different password.\",\n IDInPwd: \"Your password can't include the part of your ID. Please type a different password.\",\n FNInPwd: \"Your password can't contain your first name. Please type a different password.\",\n LNInPwd: \"Your password can't contain your last name. Please type a different password.\"\n})",
-      "memberOf" : "",
-      "isOptional" : false,
-      "optvals" : []
-    },
     {
       "name" : "allowDomMove",
       "type" : "Boolean",
@@ -202,14 +194,6 @@
       "isOptional" : false,
       "optvals" : []
     },
-    {
-      "name" : "Label",
-      "type" : "String/Object",
-      "desc" : "for the strength meter (defaults to\n'Password strength:')",
-      "memberOf" : "",
-      "isOptional" : false,
-      "optvals" : []
-    },
     {
       "name" : "hasFeedback",
       "type" : "Boolean",
@@ -403,14 +387,6 @@
       "isOptional" : false,
       "optvals" : []
     },
-    {
-      "name" : "pwdStrengths",
-      "type" : "String/Object",
-      "desc" : "A pwdStrengths spec, or true for a default spec (defaults to\n['Weak', 'Medium', 'Strong'])",
-      "memberOf" : "",
-      "isOptional" : false,
-      "optvals" : []
-    },
     {
       "name" : "fieldLabel",
       "type" : "string",
@@ -427,6 +403,14 @@
       "isOptional" : false,
       "optvals" : []
     },
+    {
+      "name" : "minimumStrength",
+      "type" : "Number",
+      "desc" : "invalid if the strength of the password input is less than the minimum strength (from 0 to 3) (default 2)",
+      "memberOf" : "",
+      "isOptional" : false,
+      "optvals" : []
+    },
     {
       "name" : "before",
       "type" : "string",
@@ -761,6 +745,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",