sync

[roojs1] / docs / json / roodata.json

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index 5ef2e95..ff660f4 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -36697,12 +36697,6 @@
         "desc" : "container The id or element that will contain the toolbar",
         "memberOf" : ""
       },
-      {
-        "name" : "dataSource",
-        "type" : "Roo.data.Store",
-        "desc" : "The underlying data store providing the paged data",
-        "memberOf" : ""
-      },
       {
         "name" : "displayInfo",
         "type" : "Boolean",
@@ -56157,6 +56151,12 @@
         "desc" : "list of events and functions to call for this object, \nFor example :\n<pre><code>\n    listeners :  { \n       'click' : function(e) {\n           ..... \n        } ,\n        .... \n    } \n  </code></pre>",
         "memberOf" : "Roo.util.Observable"
       },
+      {
+        "name" : "menu",
+        "type" : "Roo.bootstrap.Menu",
+        "desc" : "a Menu",
+        "memberOf" : ""
+      },
       {
         "name" : "name",
         "type" : "string",
@@ -58638,6 +58638,12 @@
         "desc" : "list of events and functions to call for this object, \nFor example :\n<pre><code>\n    listeners :  { \n       'click' : function(e) {\n           ..... \n        } ,\n        .... \n    } \n  </code></pre>",
         "memberOf" : "Roo.util.Observable"
       },
+      {
+        "name" : "menu",
+        "type" : "Roo.bootstrap.Menu",
+        "desc" : "a Menu",
+        "memberOf" : "Roo.bootstrap.Button"
+      },
       {
         "name" : "multiple",
         "type" : "Boolean",
@@ -66007,6 +66013,12 @@
         "desc" : "list of events and functions to call for this object, \nFor example :\n<pre><code>\n    listeners :  { \n       'click' : function(e) {\n           ..... \n        } ,\n        .... \n    } \n  </code></pre>",
         "memberOf" : "Roo.util.Observable"
       },
+      {
+        "name" : "menu",
+        "type" : "Roo.bootstrap.Menu",
+        "desc" : "a Menu",
+        "memberOf" : "Roo.bootstrap.Button"
+      },
       {
         "name" : "name",
         "type" : "string",
@@ -116475,6 +116487,12 @@
         "desc" : "list of events and functions to call for this object, \nFor example :\n<pre><code>\n    listeners :  { \n       'click' : function(e) {\n           ..... \n        } ,\n        .... \n    } \n  </code></pre>",
         "memberOf" : "Roo.util.Observable"
       },
+      {
+        "name" : "menu",
+        "type" : "Roo.bootstrap.Menu",
+        "desc" : "a Menu",
+        "memberOf" : ""
+      },
       {
         "name" : "name",
         "type" : "string",
@@ -117597,6 +117615,12 @@
   },
   "Roo.bootstrap.NavProgressBar" : {
     "props" : [
+      {
+        "name" : "NavProgressBar:bullets[]",
+        "type" : "Roo.bootstrap.NavProgressItem",
+        "desc" : "Bullets for the Nav Progress bar for the toolbar",
+        "memberOf" : ""
+      },
       {
         "name" : "actionMode",
         "type" : "String",
@@ -121043,6 +121067,12 @@
         "desc" : "list of events and functions to call for this object, \nFor example :\n<pre><code>\n    listeners :  { \n       'click' : function(e) {\n           ..... \n        } ,\n        .... \n    } \n  </code></pre>",
         "memberOf" : "Roo.util.Observable"
       },
+      {
+        "name" : "menu",
+        "type" : "Roo.bootstrap.Menu",
+        "desc" : "a Menu",
+        "memberOf" : "Roo.bootstrap.NavItem"
+      },
       {
         "name" : "name",
         "type" : "string",
@@ -128533,6 +128563,12 @@
         "desc" : "stacked | justified",
         "memberOf" : "Roo.bootstrap.NavSimplebar"
       },
+      {
+        "name" : "buttons[]",
+        "type" : "Roo.bootstrap.Button",
+        "desc" : "Buttons for the toolbar",
+        "memberOf" : ""
+      },
       {
         "name" : "can_build_overlaid",
         "type" : "Boolean",
@@ -128563,12 +128599,6 @@
         "desc" : "cutomer id",
         "memberOf" : "Roo.bootstrap.Component"
       },
-      {
-        "name" : "dataSource",
-        "type" : "Roo.data.Store",
-        "desc" : "The underlying data store providing the paged data",
-        "memberOf" : ""
-      },
       {
         "name" : "disableClass",
         "type" : "String",
@@ -128635,6 +128665,12 @@
         "desc" : "The number of records to display per page (defaults to 20)",
         "memberOf" : ""
       },
+      {
+        "name" : "store",
+        "type" : "Roo.data.Store",
+        "desc" : "The underlying data store providing the paged data",
+        "memberOf" : ""
+      },
       {
         "name" : "style",
         "type" : "String",
@@ -146460,7 +146496,7 @@
       {
         "name" : "cm[]",
         "type" : "Roo.grid.ColumnModel",
-        "desc" : "A column for th grid.",
+        "desc" : "A column for the grid.",
         "memberOf" : ""
       },
       {