* @cfg {String} href empty or href
* @cfg {Boolean} disabled default false;
* @cfg {Boolean} isClose default false;
- * @cfg {String} glyphicon depricated - use fs
+ * @cfg {String} glyphicon depricated - use fa
+ * @cfg {String} fa fontawesome icon - eg. 'comment' - without the fa/fas etc..
* @cfg {String} badge text for badge
* @cfg {String} theme (default|glow)
* @cfg {Boolean} inverse dark themed version
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();
Roo.log(h);
+ ce.removeClass('show');
+ // at this point we should be able to see it..
+ ce.addClass('collapsing');
+
ce.setHeight(0); // resize it ...
ce.on('transitionend', function() {
-
+ Roo.log('done transition');
ce.removeClass('collapsing');
ce.addClass('show');
ce.removeClass('collapse');
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);
}
}
}
if (align ==='left' && this.fieldLabel.length) {
- cfg.cls += ' roo-form-group-label-left row';
+ cfg.cls += ' roo-form-group-label-left' + (Roo.bootstrap.version == 4 ? ' row' : '');
cfg.cn = [
indicator,
if (align ==='left' && this.fieldLabel.length) {
- cfg.cls += ' roo-form-group-label-left row';
+ cfg.cls += ' roo-form-group-label-left' + (Roo.bootstrap.version == 4 ? ' row' : '');
cfg.cn = [
indicator,
var box = {
tag: 'div',
+ style : 'display: contents',
cn: [
{
tag: 'input',
}
if (align ==='left' && this.fieldLabel.length) {
- cfg.cls += ' roo-form-group-label-left row';
+ cfg.cls += ' roo-form-group-label-left' + (Roo.bootstrap.version == 4 ? ' row' : '');
cfg.cn = [
indicator,
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',
this.files = this.files.slice(0, this.boxes);
}
- this.uploader.show();
+ this.uploader.show(false);
if(this.boxes > 0 && this.files.length > this.boxes - 1){
- this.uploader.hide();
+ this.uploader.hide(false);
}
var _this = this;
arrange : function()
{
if(!this.delegates.length){
- this.progressDialog.hide();
+ this.progressDialog.hide(false);
this.refresh();
return;
}
var delegate = this.delegates.shift();
- this.progressDialog.show();
+ this.progressDialog.show(false);
this.progressDialog.setTitle((this.progressBar.aria_valuemax - this.delegates.length) + ' / ' + this.progressBar.aria_valuemax);
refresh : function()
{
- this.uploader.show();
+ this.uploader.show(false);
if(this.boxes > 0 && this.files.length > this.boxes - 1){
- this.uploader.hide();
+ this.uploader.hide(false);
}
Roo.isTouch ? this.closable(false) : this.closable(true);