From: Alan Knowles <alan@roojs.com>
Date: Thu, 28 Jan 2021 08:32:42 +0000 (+0800)
Subject: sync
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=55bf3b1fc1c850f0dacbe2ac459a3c8607bcf890

sync
---

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index 8682cf6973..9b76933bfe 100644
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -41854,20 +41854,23 @@
   "Roo.bootstrap.NavGroup" : {
     "props" : [
       {
-        "name" : "actionMode",
+        "name" : "(left|right)",
         "type" : "String",
-        "desc" : "which property holds the element that used for  hide() / show() / disable() / enable()\ndefault is 'el' for forms you probably want to set this to fieldEl",
-        "memberOf" : "Roo.Component"
+        "desc" : "align",
+        "memberOf" : ""
       },
       {
-        "name" : "align",
+        "name" : "(nav|pills|tab)",
         "type" : "String",
-        "desc" : [
-          "(left",
-          "right)"
-        ],
+        "desc" : "type  default nav",
         "memberOf" : ""
       },
+      {
+        "name" : "actionMode",
+        "type" : "String",
+        "desc" : "which property holds the element that used for  hide() / show() / disable() / enable()\ndefault is 'el' for forms you probably want to set this to fieldEl",
+        "memberOf" : "Roo.Component"
+      },
       {
         "name" : "allowDomMove",
         "type" : "Boolean",
@@ -41949,16 +41952,6 @@
         "desc" : "Text for the tooltip",
         "memberOf" : "Roo.bootstrap.Component"
       },
-      {
-        "name" : "type",
-        "type" : "String",
-        "desc" : [
-          "(nav",
-          "pills",
-          "tab)"
-        ],
-        "memberOf" : ""
-      },
       {
         "name" : "visibilityEl",
         "type" : "string|object",
@@ -49734,20 +49727,23 @@
   "Roo.bootstrap.PopoverNav" : {
     "props" : [
       {
-        "name" : "actionMode",
+        "name" : "(left|right)",
         "type" : "String",
-        "desc" : "which property holds the element that used for  hide() / show() / disable() / enable()\ndefault is 'el' for forms you probably want to set this to fieldEl",
-        "memberOf" : "Roo.Component"
+        "desc" : "align",
+        "memberOf" : "Roo.bootstrap.NavGroup"
       },
       {
-        "name" : "align",
+        "name" : "(nav|pills|tab)",
         "type" : "String",
-        "desc" : [
-          "(left",
-          "right)"
-        ],
+        "desc" : "type  default nav",
         "memberOf" : "Roo.bootstrap.NavGroup"
       },
+      {
+        "name" : "actionMode",
+        "type" : "String",
+        "desc" : "which property holds the element that used for  hide() / show() / disable() / enable()\ndefault is 'el' for forms you probably want to set this to fieldEl",
+        "memberOf" : "Roo.Component"
+      },
       {
         "name" : "allowDomMove",
         "type" : "Boolean",
@@ -49829,16 +49825,6 @@
         "desc" : "Text for the tooltip",
         "memberOf" : "Roo.bootstrap.Component"
       },
-      {
-        "name" : "type",
-        "type" : "String",
-        "desc" : [
-          "(nav",
-          "pills",
-          "tab)"
-        ],
-        "memberOf" : "Roo.bootstrap.NavGroup"
-      },
       {
         "name" : "visibilityEl",
         "type" : "string|object",
diff --git a/docs/src/Roo_bootstrap_NavGroup.js.html b/docs/src/Roo_bootstrap_NavGroup.js.html
index 2cc98c08db..0017589dd0 100644
--- a/docs/src/Roo_bootstrap_NavGroup.js.html
+++ b/docs/src/Roo_bootstrap_NavGroup.js.html
@@ -9,9 +9,9 @@
  * @class Roo.bootstrap.NavGroup
  * @extends Roo.bootstrap.Component
  * Bootstrap NavGroup class
- * @cfg {String} align (left|right)
+ * @cfg {String} (left|right) align 
  * @cfg {Boolean} inverse
- * @cfg {String} type (nav|pills|tab) default nav
+ * @cfg {String} (nav|pills|tab) type  default nav
  * @cfg {String} navId - reference Id for navbar.
 
  * 
diff --git a/docs/symbols/Roo.bootstrap.NavGroup.json b/docs/symbols/Roo.bootstrap.NavGroup.json
index 1fcb4e60fc..b09f924a33 100644
--- a/docs/symbols/Roo.bootstrap.NavGroup.json
+++ b/docs/symbols/Roo.bootstrap.NavGroup.json
@@ -24,6 +24,13 @@
   ],
   "returns" : [],
   "config" : [
+    {
+      "name" : "(nav|pills|tab)",
+      "type" : "String",
+      "desc" : "type  default nav",
+      "memberOf" : "Roo.bootstrap.NavGroup",
+      "values" : []
+    },
     {
       "name" : "listeners",
       "type" : "Object",
@@ -55,16 +62,6 @@
         "parent)"
       ]
     },
-    {
-      "name" : "align",
-      "type" : "String",
-      "desc" : "",
-      "memberOf" : "Roo.bootstrap.NavGroup",
-      "values" : [
-        "(left",
-        "right)"
-      ]
-    },
     {
       "name" : "inverse",
       "type" : "Boolean",
@@ -139,15 +136,11 @@
       "values" : []
     },
     {
-      "name" : "type",
+      "name" : "(left|right)",
       "type" : "String",
-      "desc" : "default nav",
+      "desc" : "align",
       "memberOf" : "Roo.bootstrap.NavGroup",
-      "values" : [
-        "(nav",
-        "pills",
-        "tab)"
-      ]
+      "values" : []
     },
     {
       "name" : "name",
diff --git a/docs/symbols/Roo.bootstrap.PopoverNav.json b/docs/symbols/Roo.bootstrap.PopoverNav.json
index aa6c249028..a602ef4819 100644
--- a/docs/symbols/Roo.bootstrap.PopoverNav.json
+++ b/docs/symbols/Roo.bootstrap.PopoverNav.json
@@ -25,6 +25,13 @@
   ],
   "returns" : [],
   "config" : [
+    {
+      "name" : "(nav|pills|tab)",
+      "type" : "String",
+      "desc" : "type  default nav",
+      "memberOf" : "Roo.bootstrap.NavGroup",
+      "values" : []
+    },
     {
       "name" : "listeners",
       "type" : "Object",
@@ -56,16 +63,6 @@
         "parent)"
       ]
     },
-    {
-      "name" : "align",
-      "type" : "String",
-      "desc" : "",
-      "memberOf" : "Roo.bootstrap.NavGroup",
-      "values" : [
-        "(left",
-        "right)"
-      ]
-    },
     {
       "name" : "inverse",
       "type" : "Boolean",
@@ -140,15 +137,11 @@
       "values" : []
     },
     {
-      "name" : "type",
+      "name" : "(left|right)",
       "type" : "String",
-      "desc" : "default nav",
+      "desc" : "align",
       "memberOf" : "Roo.bootstrap.NavGroup",
-      "values" : [
-        "(nav",
-        "pills",
-        "tab)"
-      ]
+      "values" : []
     },
     {
       "name" : "name",
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index fec561e2a1..2e67227f58 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -5728,9 +5728,9 @@ Roo.extend(Roo.bootstrap.NavSidebar, Roo.bootstrap.Navbar,  {
  * @class Roo.bootstrap.NavGroup
  * @extends Roo.bootstrap.Component
  * Bootstrap NavGroup class
- * @cfg {String} align (left|right)
+ * @cfg {String} (left|right) align 
  * @cfg {Boolean} inverse
- * @cfg {String} type (nav|pills|tab) default nav
+ * @cfg {String} (nav|pills|tab) type  default nav
  * @cfg {String} navId - reference Id for navbar.
 
  *