From: Alan Knowles Date: Thu, 19 Aug 2021 03:02:06 +0000 (+0800) Subject: fix menu children X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=f94d8932982ce42a87b91d281ce0cdd4fcabd1e5 fix menu children --- diff --git a/Roo/bootstrap/menu/Menu.js b/Roo/bootstrap/menu/Menu.js index caf2b13ffa..07bd3d2177 100644 --- 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 a4bed05ce8..4367cb48a0 100644 --- 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 c52e962ae7..b46ed5d072 100644 --- a/docs/src/Roo_bootstrap_PagingToolbar.js.html +++ b/docs/src/Roo_bootstrap_PagingToolbar.js.html @@ -258,7 +258,7 @@ }, // private - onLoadError : function(o){ + onLoadError : function(proxy, o){ this.loading.enable(); if (this.ds.events.loadexception.listeners.length < 2) { // 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 6c33b1f496..cf22de2867 100644 --- 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 6d8c8e6aef..c791baed03 100644 --- 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"