sync

diff --git a/Roo/PagingToolbar.js b/Roo/PagingToolbar.js
index 55d8271..9b0d7ec 100644 (file)
--- a/Roo/PagingToolbar.js
+++ b/Roo/PagingToolbar.js
@@ -48,10 +48,7 @@ Roo.PagingToolbar = function(el, ds, config)
 };
 
 Roo.extend(Roo.PagingToolbar, Roo.Toolbar, {
-    /**
-     * @cfg {Roo.data.Store} dataSource
-     * The underlying data store providing the paged data
-     */
+   
     /**
      * @cfg {String/HTMLElement/Element} container
      * container The id or element that will contain the toolbar
@@ -60,6 +57,8 @@ Roo.extend(Roo.PagingToolbar, Roo.Toolbar, {
      * @cfg {Boolean} displayInfo
      * True to display the displayMsg (defaults to false)
      */
+    
+    
     /**
      * @cfg {Number} pageSize
      * The number of records to display per page (defaults to 20)

diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js
index feb0fdb..b531847 100644 (file)
--- a/Roo/bootstrap/Button.js
+++ b/Roo/bootstrap/Button.js
@@ -31,7 +31,8 @@
  * @cfg {Boolean} removeClass remove the standard class..
  * @cfg {String} target (_self|_blank|_parent|_top|other) target for a href. 
  * @cfg {Boolean} grpup if parent is a btn group - then it turns it into a toogleGroup.
- * 
+ * @cfg {Roo.bootstrap.Menu} menu a Menu 
+
  * @constructor
  * Create a new button
  * @param {Object} config The config object

diff --git a/Roo/bootstrap/ButtonGroup.js b/Roo/bootstrap/ButtonGroup.js
index 4c50892..e2554f7 100644 (file)
--- a/Roo/bootstrap/ButtonGroup.js
+++ b/Roo/bootstrap/ButtonGroup.js
@@ -10,6 +10,8 @@
  * @class Roo.bootstrap.ButtonGroup
  * @extends Roo.bootstrap.Component
  * Bootstrap ButtonGroup class
+ * @children Roo.bootstrap.Button Roo.bootstrap.Form
+ * 
  * @cfg {String} size lg | sm | xs (default empty normal)
  * @cfg {String} align vertical | justified  (default none)
  * @cfg {String} direction up | down (default down)

diff --git a/Roo/bootstrap/Card.js b/Roo/bootstrap/Card.js
index f3c41c4..330aad2 100644 (file)
--- a/Roo/bootstrap/Card.js
+++ b/Roo/bootstrap/Card.js
@@ -1,14 +1,9 @@
-/*
- *  - LGPL
- *
- *  This is BS4's Card element.. - similar to our containers probably..
- * 
- */
 /**
  * @class Roo.bootstrap.Card
  * @extends Roo.bootstrap.Component
  * @children Roo.bootstrap.Component
- * Bootstrap Card class
+ * @licence LGPL
+ * Bootstrap Card class - note this has children as CardHeader/ImageTop/Footer.. - which should really be listed properties?
  *
  *
  * possible... may not be implemented..

diff --git a/Roo/bootstrap/CardFooter.js b/Roo/bootstrap/CardFooter.js
index bc4d288..eebe8ce 100644 (file)
--- a/Roo/bootstrap/CardFooter.js
+++ b/Roo/bootstrap/CardFooter.js
@@ -8,7 +8,10 @@
 /**
  * @class Roo.bootstrap.CardFooter
  * @extends Roo.bootstrap.Element
+ * @parent Roo.bootstrap.Card
+ * @children Roo.bootstrap.Component
  * Bootstrap CardFooter class
+ * 
  * @constructor
  * Create a new Card Footer - that you can embed children into
  * @param {Object} config The config object

diff --git a/Roo/bootstrap/CardHeader.js b/Roo/bootstrap/CardHeader.js
index a0b8725..883eb04 100644 (file)
--- a/Roo/bootstrap/CardHeader.js
+++ b/Roo/bootstrap/CardHeader.js
@@ -8,6 +8,8 @@
 /**
  * @class Roo.bootstrap.CardHeader
  * @extends Roo.bootstrap.Element
+ * @parent Roo.bootstrap.Card
+ * @children Roo.bootstrap.Component
  * Bootstrap CardHeader class
  * @constructor
  * Create a new Card Header - that you can embed children into

diff --git a/Roo/bootstrap/CardImageTop.js b/Roo/bootstrap/CardImageTop.js
index 0bb3fb4..46cfb1f 100644 (file)
--- a/Roo/bootstrap/CardImageTop.js
+++ b/Roo/bootstrap/CardImageTop.js
@@ -8,7 +8,10 @@
 /**
  * @class Roo.bootstrap.CardImageTop
  * @extends Roo.bootstrap.Element
+ * @parent Roo.bootstrap.Card
+ * @children Roo.bootstrap.Component
  * Bootstrap CardImageTop class
+ * 
  * @constructor
  * Create a new Card Image Top container
  * @param {Object} config The config object

diff --git a/Roo/bootstrap/Menu.js b/Roo/bootstrap/Menu.js
index e5fa5cf..d5734c4 100644 (file)
--- a/Roo/bootstrap/Menu.js
+++ b/Roo/bootstrap/Menu.js
@@ -8,7 +8,9 @@
 /**
  * @class Roo.bootstrap.Menu
  * @extends Roo.bootstrap.Component
+ * @children Roo.bootstrap.MenuItem
  * Bootstrap Menu class - container for MenuItems
+ * 
  * @cfg {String} type (dropdown|treeview|submenu) type of menu
  * @cfg {bool} hidden  if the menu should be hidden when rendered.
  * @cfg {bool} stopEvent (true|false)  Stop event after trigger press (default true)

diff --git a/Roo/bootstrap/NavItem.js b/Roo/bootstrap/NavItem.js
index 5b4494d..956c457 100644 (file)
--- a/Roo/bootstrap/NavItem.js
+++ b/Roo/bootstrap/NavItem.js
@@ -25,6 +25,7 @@
  * @cfg {String} tabId the tab that this item activates.
  * @cfg {String} tagtype (a|span) render as a href or span?
  * @cfg {Boolean} animateRef (true|false) link to element default false  
+ * @cfg {Roo.bootstrap.Menu} menu a Menu 
   
  * @constructor
  * Create a new Navbar Item

diff --git a/Roo/bootstrap/NavProgressBar.js b/Roo/bootstrap/NavProgressBar.js
index 7afa07c..edd8d43 100644 (file)
--- a/Roo/bootstrap/NavProgressBar.js
+++ b/Roo/bootstrap/NavProgressBar.js
@@ -11,7 +11,7 @@
  * Bootstrap NavProgressBar class
  * 
  * @constructor
- * Create a new nav progress bar
+ * Create a new nav progress bar - a bar indicating step along a process
  * @param {Object} config The config object
  */
 
@@ -35,7 +35,10 @@ Roo.bootstrap.NavProgressBar = function(config){
 };
 
 Roo.extend(Roo.bootstrap.NavProgressBar, Roo.bootstrap.Component,  {
-    
+    /**
+     * @cfg {Roo.bootstrap.NavProgressItem} NavProgressBar:bullets[]
+     * Bullets for the Nav Progress bar for the toolbar
+     */
     bullets : [],
     barItems : [],
     

diff --git a/Roo/bootstrap/PagingToolbar.js b/Roo/bootstrap/PagingToolbar.js
index 8cbb7fe..60710ac 100644 (file)
--- a/Roo/bootstrap/PagingToolbar.js
+++ b/Roo/bootstrap/PagingToolbar.js
@@ -54,7 +54,11 @@ Roo.bootstrap.PagingToolbar = function(config)
 
 Roo.extend(Roo.bootstrap.PagingToolbar, Roo.bootstrap.NavSimplebar, {
     /**
-     * @cfg {Roo.data.Store} dataSource
+     * @cfg {Roo.bootstrap.Button} buttons[]
+     * Buttons for the toolbar
+     */
+     /**
+     * @cfg {Roo.data.Store} store
      * The underlying data store providing the paged data
      */
     /**

diff --git a/Roo/bootstrap/Progress.js b/Roo/bootstrap/Progress.js
index 1960687..4034265 100644 (file)
--- a/Roo/bootstrap/Progress.js
+++ b/Roo/bootstrap/Progress.js
@@ -8,6 +8,7 @@
 /**
  * @class Roo.bootstrap.Progress
  * @extends Roo.bootstrap.Component
+ * @children Roo.bootstrap.ProgressBar
  * Bootstrap Progress class
  * @cfg {Boolean} striped striped of the progress bar
  * @cfg {Boolean} active animated of the progress bar

diff --git a/Roo/bootstrap/RadioSet.js b/Roo/bootstrap/RadioSet.js
index a1ff9f3..b654347 100644 (file)
--- a/Roo/bootstrap/RadioSet.js
+++ b/Roo/bootstrap/RadioSet.js
@@ -9,6 +9,7 @@
 /**
  * @class Roo.bootstrap.RadioSet
  * @extends Roo.bootstrap.Input
+ * @children Roo.bootstrap.Radio
  * Bootstrap RadioSet class
  * @cfg {String} indicatorpos (left|right) default left
  * @cfg {Boolean} inline (true|false) inline the element (default true)

diff --git a/Roo/bootstrap/TabGroup.js b/Roo/bootstrap/TabGroup.js
index a0e4387..ea85838 100644 (file)
--- a/Roo/bootstrap/TabGroup.js
+++ b/Roo/bootstrap/TabGroup.js
@@ -1,13 +1,7 @@
-/*
- * - LGPL
- *
- * column
- * 
- */
-
 /**
  * @class Roo.bootstrap.TabGroup
  * @extends Roo.bootstrap.Column
+ * @children Roo.bootstrap.TabPanel
  * Bootstrap Column class
  * @cfg {String} navId the navigation id (for use with navbars) - will be auto generated if it does not exist..
  * @cfg {Boolean} carousel true to make the group behave like a carousel

diff --git a/Roo/bootstrap/Table.js b/Roo/bootstrap/Table.js
index b37485a..6ece84b 100644 (file)
--- a/Roo/bootstrap/Table.js
+++ b/Roo/bootstrap/Table.js
@@ -2,6 +2,7 @@
  * @class Roo.bootstrap.Table
  * @licence LGBL
  * @extends Roo.bootstrap.Component
+ * @children Roo.bootstrap.TableBody
  * Bootstrap Table class.  This class represents the primary interface of a component based grid control.
  * Similar to Roo.grid.Grid
  * <pre><code>
@@ -65,7 +66,7 @@ Currently the Table  uses multiple headers to try and handle XL / Medium etc...
  *
  * @cfg {Roo.grid.AbstractSelectionModel} sm The selection model to use (cell selection is not supported yet)
  * @cfg {Roo.data.Store} store The data store to use
- * @cfg {Roo.grid.ColumnModel} cm[] A column for th grid.
+ * @cfg {Roo.grid.ColumnModel} cm[] A column for the grid.
  * 
  * @cfg {String} cls table class
  *

diff --git a/Roo/bootstrap/TableBody.js b/Roo/bootstrap/TableBody.js
index 8f23365..77af7cd 100644 (file)
--- a/Roo/bootstrap/TableBody.js
+++ b/Roo/bootstrap/TableBody.js
@@ -8,6 +8,8 @@
 /**
  * @class Roo.bootstrap.TableBody
  * @extends Roo.bootstrap.Component
+ * @children Roo.bootstrap.TableRow
+ * @parent Roo.bootstrap.Table
  * Bootstrap TableBody class
  * @cfg {String} cls element class
  * @cfg {String} tag element tag (thead|tbody|tfoot) default tbody

diff --git a/Roo/bootstrap/TableCell.js b/Roo/bootstrap/TableCell.js
index 09df6ff..b936242 100644 (file)
--- a/Roo/bootstrap/TableCell.js
+++ b/Roo/bootstrap/TableCell.js
@@ -8,7 +8,10 @@
 /**
  * @class Roo.bootstrap.TableCell
  * @extends Roo.bootstrap.Component
+ * @children Roo.bootstrap.Component
+ * @parent Roo.bootstrap.TableRow
  * Bootstrap TableCell class
+ * 
  * @cfg {String} html cell contain text
  * @cfg {String} cls cell class
  * @cfg {String} tag cell tag (td|th) default td

diff --git a/Roo/bootstrap/TableRow.js b/Roo/bootstrap/TableRow.js
index 9e20d2a..2843c9c 100644 (file)
--- a/Roo/bootstrap/TableRow.js
+++ b/Roo/bootstrap/TableRow.js
@@ -8,6 +8,8 @@
 /**
  * @class Roo.bootstrap.TableRow
  * @extends Roo.bootstrap.Component
+ * @children Roo.bootstrap.TableCell
+ * @parent Roo.bootstrap.TableBody
  * Bootstrap TableRow class
  * @cfg {String} cls row class
  * @cfg {String} align Aligns the content in a table row

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index bfc6fd3..5ef2e95 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -173432,7 +173432,7 @@
       {
         "name" : "region",
         "type" : "String",
-        "desc" : "t) which region to put this panel on (when used with xtype constructors)",
+        "desc" : "[required] (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)",
         "memberOf" : ""
       },
       {
@@ -174387,7 +174387,7 @@
       {
         "name" : "region",
         "type" : "String",
-        "desc" : "t) which region to put this panel on (when used with xtype constructors)",
+        "desc" : "[required] (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)",
         "memberOf" : "Roo.bootstrap.panel.Content"
       },
       {
@@ -175361,7 +175361,7 @@
       {
         "name" : "region",
         "type" : "String",
-        "desc" : "t) which region to put this panel on (when used with xtype constructors)",
+        "desc" : "[required] (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)",
         "memberOf" : "Roo.bootstrap.panel.Content"
       },
       {

diff --git a/docs/src/Roo_bootstrap_panel_Content.js.html b/docs/src/Roo_bootstrap_panel_Content.js.html
index 97b37ed..30e488f 100644 (file)
--- a/docs/src/Roo_bootstrap_panel_Content.js.html
+++ b/docs/src/Roo_bootstrap_panel_Content.js.html
@@ -25,7 +25,7 @@
  * @cfg {String} title          The title for this panel
  * @cfg {Array} adjustments     Values to <b>add</b> to the width/height when doing a {@link #fitToFrame} (default is [0, 0])
  * @cfg {String} url            Calls {@link #setUrl} with this value
- * @cfg {String} region         (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)
+ * @cfg {String} region  [required] (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)
  * @cfg {String/Object} params  When used with {@link #url}, calls {@link #setUrl} with this value
  * @cfg {Boolean} loadOnce      When used with {@link #url}, calls {@link #setUrl} with this value
  * @cfg {String}    content        Raw content to fill content panel with (uses setContent on construction.)
@@ -36,10 +36,8 @@
  
  * @constructor
  * Create a new ContentPanel.
- * @param {String/HTMLElement/Roo.Element} el The container element for this panel
  * @param {String/Object} config A string to set only the title or a config object
- * @param {String} content (optional) Set the HTML content for this panel
- * @param {String} region (optional) Used by xtype constructors to add to regions. (values center,east,west,south,north)
+ 
  */
 </span><span class="jsdoc-var">Roo.bootstrap.panel.Content </span><span class="jsdoc-syntax">= </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">( </span><span class="jsdoc-var">config</span><span class="jsdoc-syntax">){
 

diff --git a/docs/symbols/Roo.bootstrap.panel.Content.json b/docs/symbols/Roo.bootstrap.panel.Content.json
index 42195a0..b8311fd 100644 (file)
--- a/docs/symbols/Roo.bootstrap.panel.Content.json
+++ b/docs/symbols/Roo.bootstrap.panel.Content.json
@@ -13,29 +13,11 @@
   "since" : "",
   "see" : "",
   "params" : [
-    {
-      "name" : "el",
-      "type" : "String/HTMLElement/Roo.Element",
-      "desc" : "The container element for this panel",
-      "isOptional" : false
-    },
     {
       "name" : "config",
       "type" : "String/Object",
       "desc" : "A string to set only the title or a config object",
       "isOptional" : false
-    },
-    {
-      "name" : "content",
-      "type" : "String",
-      "desc" : "(optional) Set the HTML content for this panel",
-      "isOptional" : false
-    },
-    {
-      "name" : "region",
-      "type" : "String",
-      "desc" : "(optional) Used by xtype constructors to add to regions. (values center,east,west,south,north)",
-      "isOptional" : false
     }
   ],
   "returns" : [],
@@ -87,7 +69,7 @@
     {
       "name" : "region",
       "type" : "String",
-      "desc" : "t) which region to put this panel on (when used with xtype constructors)",
+      "desc" : "[required] (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)",
       "memberOf" : ""
     },
     {

diff --git a/docs/symbols/Roo.bootstrap.panel.Grid.json b/docs/symbols/Roo.bootstrap.panel.Grid.json
index b4b9878..54f38ca 100644 (file)
--- a/docs/symbols/Roo.bootstrap.panel.Grid.json
+++ b/docs/symbols/Roo.bootstrap.panel.Grid.json
@@ -70,7 +70,7 @@
     {
       "name" : "region",
       "type" : "String",
-      "desc" : "t) which region to put this panel on (when used with xtype constructors)",
+      "desc" : "[required] (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)",
       "memberOf" : "Roo.bootstrap.panel.Content"
     },
     {

diff --git a/docs/symbols/Roo.bootstrap.panel.Nest.json b/docs/symbols/Roo.bootstrap.panel.Nest.json
index a93f0df..8c2b940 100644 (file)
--- a/docs/symbols/Roo.bootstrap.panel.Nest.json
+++ b/docs/symbols/Roo.bootstrap.panel.Nest.json
@@ -76,7 +76,7 @@
     {
       "name" : "region",
       "type" : "String",
-      "desc" : "t) which region to put this panel on (when used with xtype constructors)",
+      "desc" : "[required] (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)",
       "memberOf" : "Roo.bootstrap.panel.Content"
     },
     {

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 6bf6c7d..b2cb998 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -40584,7 +40584,7 @@ Roo.extend(Roo.bootstrap.layout.West, Roo.bootstrap.layout.Split, {
  * @cfg {String} title          The title for this panel
  * @cfg {Array} adjustments     Values to <b>add</b> to the width/height when doing a {@link #fitToFrame} (default is [0, 0])
  * @cfg {String} url            Calls {@link #setUrl} with this value
- * @cfg {String} region         (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)
+ * @cfg {String} region  [required] (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)
  * @cfg {String/Object} params  When used with {@link #url}, calls {@link #setUrl} with this value
  * @cfg {Boolean} loadOnce      When used with {@link #url}, calls {@link #setUrl} with this value
  * @cfg {String}    content        Raw content to fill content panel with (uses setContent on construction.)
@@ -40595,10 +40595,8 @@ Roo.extend(Roo.bootstrap.layout.West, Roo.bootstrap.layout.Split, {
  
  * @constructor
  * Create a new ContentPanel.
- * @param {String/HTMLElement/Roo.Element} el The container element for this panel
  * @param {String/Object} config A string to set only the title or a config object
- * @param {String} content (optional) Set the HTML content for this panel
- * @param {String} region (optional) Used by xtype constructors to add to regions. (values center,east,west,south,north)
+ 
  */
 Roo.bootstrap.panel.Content = function( config){