fix conflicts

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

diff --git a/docs/symbols/Roo.form.VTypes.json b/docs/symbols/Roo.form.VTypes.json
index df5de57..3c864f9 100644 (file)
--- a/docs/symbols/Roo.form.VTypes.json
+++ b/docs/symbols/Roo.form.VTypes.json
@@ -22,7 +22,7 @@
   "config" : [],
   "methods" : [
     {
-      "name" : "email'",
+      "name" : "email",
       "type" : "function",
       "desc" : "The function used to validate email addresses",
       "sig" : "(value)",
@@ -48,9 +48,9 @@
       "returns" : []
     },
     {
-      "name" : "url'",
+      "name" : "alpha",
       "type" : "function",
-      "desc" : "The function used to validate URLs",
+      "desc" : "The function used to validate alpha values",
       "sig" : "(value)",
       "static" : false,
       "memberOf" : "",
@@ -67,16 +67,16 @@
         {
           "name" : "value",
           "type" : "String",
-          "desc" : "The URL",
+          "desc" : "The value",
           "isOptional" : false
         }
       ],
       "returns" : []
     },
     {
-      "name" : "alpha'",
+      "name" : "url",
       "type" : "function",
-      "desc" : "The function used to validate alpha values",
+      "desc" : "The function used to validate URLs",
       "sig" : "(value)",
       "static" : false,
       "memberOf" : "",
@@ -93,14 +93,40 @@
         {
           "name" : "value",
           "type" : "String",
-          "desc" : "The value",
+          "desc" : "The URL",
+          "isOptional" : false
+        }
+      ],
+      "returns" : []
+    },
+    {
+      "name" : "urlWeb",
+      "type" : "function",
+      "desc" : "The funciton used to validate URLs (only allow schemes 'https' and 'http')",
+      "sig" : "(v)",
+      "static" : false,
+      "memberOf" : "",
+      "isStatic" : false,
+      "isConstructor" : false,
+      "isPrivate" : false,
+      "example" : "",
+      "deprecated" : "",
+      "since" : "",
+      "see" : "",
+      "exceptions" : "",
+      "requires" : "",
+      "params" : [
+        {
+          "name" : "v",
+          "type" : "String",
+          "desc" : "The URL",
           "isOptional" : false
         }
       ],
       "returns" : []
     },
     {
-      "name" : "alphanum'",
+      "name" : "alphanum",
       "type" : "function",
       "desc" : "The function used to validate alphanumeric values",
       "sig" : "(value)",