fix menu children

diff --git a/Roo/bootstrap/menu/Menu.js b/Roo/bootstrap/menu/Menu.js
index caf2b13..07bd3d2 100644 (file)
--- a/Roo/bootstrap/menu/Menu.js
+++ b/Roo/bootstrap/menu/Menu.js
@@ -3,7 +3,7 @@
  * @class Roo.bootstrap.menu.Menu
  * @extends Roo.bootstrap.Component
  * @licence LGPL
- * @children Roo.bootstrap.menu.Item
+ * @children Roo.bootstrap.menu.Item Roo.bootstrap.menu.Separator
  * @parent none
  * Bootstrap Menu class - container for MenuItems - normally has to be added to a object that supports the menu property
  * 
@@ -11,8 +11,8 @@
  * @cfg {bool} hidden  if the menu should be hidden when rendered.
  * @cfg {bool} stopEvent (true|false)  Stop event after trigger press (default true)
  * @cfg {bool} isLink (true|false)  the menu has link disable auto expand and collaspe (default false)
-  * @cfg {bool} hideTrigger (true|false)  default false - hide the carret for trigger.
-  * @cfg {String} align  default tl-bl? == below  - how the menu should be aligned. 
+* @cfg {bool} hideTrigger (true|false)  default false - hide the carret for trigger.
+* @cfg {String} align  default tl-bl? == below  - how the menu should be aligned. 
  
  * @constructor
  * Create a new Menu

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index a4bed05..4367cb4 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -162158,7 +162158,8 @@
     "isBuilderTop" : false,
     "implementations" : [],
     "tree_children" : [
-      "Roo.bootstrap.menu.Item"
+      "Roo.bootstrap.menu.Item",
+      "Roo.bootstrap.menu.Separator"
     ],
     "tree_parent" : [
       "none"

diff --git a/docs/src/Roo_bootstrap_PagingToolbar.js.html b/docs/src/Roo_bootstrap_PagingToolbar.js.html
index c52e962..b46ed5d 100644 (file)
--- a/docs/src/Roo_bootstrap_PagingToolbar.js.html
+++ b/docs/src/Roo_bootstrap_PagingToolbar.js.html
@@ -258,7 +258,7 @@
     },
 
     </span><span class="jsdoc-comment">// private
-    </span><span class="jsdoc-var">onLoadError </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">o</span><span class="jsdoc-syntax">){
+    </span><span class="jsdoc-var">onLoadError </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">proxy</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">o</span><span class="jsdoc-syntax">){
         </span><span class="jsdoc-var">this.loading.enable</span><span class="jsdoc-syntax">();
         </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.ds.events.loadexception.listeners.length  </span><span class="jsdoc-syntax">&lt; 2) {
             </span><span class="jsdoc-comment">// nothing has been assigned to loadexception except this...

diff --git a/docs/src/Roo_bootstrap_menu_Menu.js.html b/docs/src/Roo_bootstrap_menu_Menu.js.html
index 6c33b1f..cf22de2 100644 (file)
--- a/docs/src/Roo_bootstrap_menu_Menu.js.html
+++ b/docs/src/Roo_bootstrap_menu_Menu.js.html
@@ -3,7 +3,7 @@
  * @class Roo.bootstrap.menu.Menu
  * @extends Roo.bootstrap.Component
  * @licence LGPL
- * @children Roo.bootstrap.menu.Item
+ * @children Roo.bootstrap.menu.Item Roo.bootstrap.menu.Separator
  * @parent none
  * Bootstrap Menu class - container for MenuItems - normally has to be added to a object that supports the menu property
  * 
@@ -11,8 +11,8 @@
  * @cfg {bool} hidden  if the menu should be hidden when rendered.
  * @cfg {bool} stopEvent (true|false)  Stop event after trigger press (default true)
  * @cfg {bool} isLink (true|false)  the menu has link disable auto expand and collaspe (default false)
-  * @cfg {bool} hideTrigger (true|false)  default false - hide the carret for trigger.
-  * @cfg {String} align  default tl-bl? == below  - how the menu should be aligned. 
+* @cfg {bool} hideTrigger (true|false)  default false - hide the carret for trigger.
+* @cfg {String} align  default tl-bl? == below  - how the menu should be aligned. 
  
  * @constructor
  * Create a new Menu

diff --git a/docs/symbols/Roo.bootstrap.menu.Menu.json b/docs/symbols/Roo.bootstrap.menu.Menu.json
index 6d8c8e6..c791bae 100644 (file)
--- a/docs/symbols/Roo.bootstrap.menu.Menu.json
+++ b/docs/symbols/Roo.bootstrap.menu.Menu.json
@@ -7,7 +7,8 @@
   ],
   "childClasses" : {  },
   "tree_children" : [
-    "Roo.bootstrap.menu.Item"
+    "Roo.bootstrap.menu.Item",
+    "Roo.bootstrap.menu.Separator"
   ],
   "tree_parent" : [
     "none"