if(this.isContainer){
return {
tag: 'li',
- cls: 'dropdown-menu-item dropdown-item'
+ cls: 'dropdown-menu-item '
};
}
var ctag = {
var anc = {
tag : 'a',
+ cls : 'dropdown-item',
href : '#',
cn : [ ]
};
var cfg= {
tag: 'li',
- cls: 'dropdown-menu-item dropdown-item',
+ cls: 'dropdown-menu-item',
cn: [ anc ]
};
if (this.parent().type == 'treeview') {
if (ce.hasClass('collapse')) {
// show it...
ce.removeClass('collapse');
- ce.addClass('collapsing');
+ ce.addClass('show');
var h = ce.getHeight();
- ce.setHeight(0); // resize it ...
-
-
-
- // now flag it as moving..
+ Roo.log(h);
+ ce.removeClass('show');
+ // at this point we should be able to see it..
+ ce.addClass('collapsing');
- (function() {
+ ce.setHeight(0); // resize it ...
+ ce.on('transitionend', function() {
+ Roo.log('done transition');
ce.removeClass('collapsing');
ce.addClass('show');
ce.removeClass('collapse');
ce.dom.style.height = '';
- }).defer(500);
- ce.setHeight(h)
+ }, this, { single: true} );
+ ce.setHeight(h);
} else {
- ce.addClass('collapsing');
+ ce.setHeight(ce.getHeight());
ce.removeClass('show');
- (function() {
+ ce.addClass('collapsing');
+
+ ce.on('transitionend', function() {
+ ce.dom.style.height = '';
ce.removeClass('collapsing');
ce.addClass('collapse');
-
- }).defer(200);
-
+ }, this, { single: true} );
+ ce.setHeight(0);
}
}
var box = {
tag: 'div',
+ style : 'display: contents',
cn: [
{
tag: 'input',
size : 'sm',
xtype: 'Button',
xns: Roo.bootstrap,
- glyphicon : id,
+ //glyphicon : id,
+ fa: id,
cmd : id || cmd,
enableToggle:toggle !== false,
html : html || '',
xtype: 'Button',
size : 'sm',
xns: Roo.bootstrap,
- glyphicon : 'font',
+ fa : 'font',
//html : 'submit'
menu : {
xtype: 'Menu',