From c743f8910c2ecd20d46c98329889f4e39472df35 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 25 Jan 2019 09:28:57 +0800 Subject: [PATCH] Changed docs/src/Roo_bootstrap_Column.js.htmldocs/src/Roo_bootstrap_ComboBox.js.htmldocs/src/Roo_bootstrap_NavGroup.js.htmldocs/src/Roo_bootstrap_NavHeaderbar.js.htmldocs/src/Roo_bootstrap_NavItem.js.htmldocs/src/Roo_bootstrap_NavSimplebar.js.htmldocs/src/Roo_bootstrap_Navbar.js.htmldocs/src/Roo_bootstrap_Table.js.htmldocs/src/Roo_bootstrap_TriggerField.js.htmldocs/symbols/Roo.bootstrap.ComboBox.jsondocs/symbols/Roo.bootstrap.MoneyField.jsondocs/symbols/Roo.bootstrap.PhoneInput.jsondocs/symbols/Roo.bootstrap.TriggerField.json --- docs/src/Roo_bootstrap_Column.js.html | 6 ++++-- docs/src/Roo_bootstrap_ComboBox.js.html | 5 ++--- docs/src/Roo_bootstrap_NavGroup.js.html | 9 ++++++-- docs/src/Roo_bootstrap_NavHeaderbar.js.html | 2 +- docs/src/Roo_bootstrap_NavItem.js.html | 2 +- docs/src/Roo_bootstrap_NavSimplebar.js.html | 13 +++++++----- docs/src/Roo_bootstrap_Navbar.js.html | 6 +++--- docs/src/Roo_bootstrap_Table.js.html | 22 +++++++++++++++----- docs/src/Roo_bootstrap_TriggerField.js.html | 4 ++-- docs/symbols/Roo.bootstrap.ComboBox.json | 2 +- docs/symbols/Roo.bootstrap.MoneyField.json | 2 +- docs/symbols/Roo.bootstrap.PhoneInput.json | 2 +- docs/symbols/Roo.bootstrap.TriggerField.json | 2 +- 13 files changed, 49 insertions(+), 28 deletions(-) diff --git a/docs/src/Roo_bootstrap_Column.js.html b/docs/src/Roo_bootstrap_Column.js.html index def6765077..530bbb7da5 100644 --- a/docs/src/Roo_bootstrap_Column.js.html +++ b/docs/src/Roo_bootstrap_Column.js.html @@ -76,10 +76,12 @@ } if (!settings[size]) { // 0 = hidden - cfg.cls += ' hidden-' + size; + cfg.cls += ' hidden-' + size + ' hidden' + size + '-down';; return; } - cfg.cls += ' col-' + size + '-' + settings[size]; + cfg.cls += ' col-' + size + '-' + settings[size] + ( + size == 'xs' ? (' col-' + settings[size] ) : '' // bs4 col-{num} replaces col-xs + ); }); diff --git a/docs/src/Roo_bootstrap_ComboBox.js.html b/docs/src/Roo_bootstrap_ComboBox.js.html index f3e33702b8..1fa84d6694 100644 --- a/docs/src/Roo_bootstrap_ComboBox.js.html +++ b/docs/src/Roo_bootstrap_ComboBox.js.html @@ -2283,8 +2283,7 @@ if(!this.multiple && this.showToggleBtn){ var caret = { - tag: 'span', - cls: 'caret' + cls: 'caret' }; if (this.caret != false) { @@ -2299,7 +2298,7 @@ tag :'span', cls : 'input-group-addon input-group-append input-group-text btn dropdown-toggle', cn : [ - caret, + Roo.bootstrap.version == 3 ? caret : '', { tag: 'span', cls: 'combobox-clear', diff --git a/docs/src/Roo_bootstrap_NavGroup.js.html b/docs/src/Roo_bootstrap_NavGroup.js.html index 82602c4f64..2cc98c08db 100644 --- a/docs/src/Roo_bootstrap_NavGroup.js.html +++ b/docs/src/Roo_bootstrap_NavGroup.js.html @@ -61,8 +61,13 @@ if (['tabs','pills'].indexOf(this.type) != -1) { cfg.cls += ' nav-' + this.type; } else { - cfg.cls += ' navbar-nav'; + // trying to remove so header bar can right align top? + if (this.parent() && this.parent().xtype != 'NavHeaderbar') { + // do not use on header bar... + cfg.cls += ' navbar-nav'; + } } + } else { if (['tabs','pills'].indexOf(this.type) != -1) { cfg.cls += ' nav-' + this.type @@ -88,7 +93,7 @@ tag: 'form', cls: 'navbar-form form-inline' }; - + //nav navbar-right ml-md-auto if (this.align === 'right') { cfg.cls += ' navbar-right ml-md-auto'; } else { diff --git a/docs/src/Roo_bootstrap_NavHeaderbar.js.html b/docs/src/Roo_bootstrap_NavHeaderbar.js.html index 9ae7a05353..91f48db619 100644 --- a/docs/src/Roo_bootstrap_NavHeaderbar.js.html +++ b/docs/src/Roo_bootstrap_NavHeaderbar.js.html @@ -93,7 +93,7 @@ cn.push({ tag: 'div', - cls: 'collapse navbar-collapse', + cls: Roo.bootstrap.version == 4 ? 'nav flex-row roo-navbar-collapse' : 'collapse navbar-collapse roo-navbar-collapse', cn : [] }); diff --git a/docs/src/Roo_bootstrap_NavItem.js.html b/docs/src/Roo_bootstrap_NavItem.js.html index 6c8491cd22..8626881f14 100644 --- a/docs/src/Roo_bootstrap_NavItem.js.html +++ b/docs/src/Roo_bootstrap_NavItem.js.html @@ -247,7 +247,7 @@ // if parent is a navbarheader....- and link is probably a '#' page ref.. then remove the expanded menu. if (p.parentType == 'NavHeaderbar' && !this.menu) { // remove the collapsed menu expand... - p.parent().el.select('.navbar-collapse',true).removeClass('in'); + p.parent().el.select('.roo-navbar-collapse',true).removeClass('in'); } }, diff --git a/docs/src/Roo_bootstrap_NavSimplebar.js.html b/docs/src/Roo_bootstrap_NavSimplebar.js.html index ba3d3beb04..a5d7bf4cda 100644 --- a/docs/src/Roo_bootstrap_NavSimplebar.js.html +++ b/docs/src/Roo_bootstrap_NavSimplebar.js.html @@ -55,7 +55,7 @@ var cfg = { tag : this.tag || 'div', - cls : 'navbar navbar-expand-lg roo-navbar-simple' + cls : 'navbar roo-navbar-simple' //navbar-expand-lg ?? }; if (['light','white'].indexOf(this.weight) > -1) { cfg.cls += ['light','white'].indexOf(this.weight) > -1 ? ' navbar-light' : ' navbar-dark'; @@ -69,13 +69,16 @@ // i'm not actually sure these are really used - normally we add a navGroup to a navbar - //if (Roo.bootstrap.version == 4) { - // return cfg; - //} + if (Roo.bootstrap.version == 4 && this.xtype == 'NavSimplebar') { + return cfg; + } + + + cfg.cn = [ { - cls: 'nav', + cls: 'nav nav-' + this.xtype, tag : 'ul' } ]; diff --git a/docs/src/Roo_bootstrap_Navbar.js.html b/docs/src/Roo_bootstrap_Navbar.js.html index 45ed0c1384..3b422f8e11 100644 --- a/docs/src/Roo_bootstrap_Navbar.js.html +++ b/docs/src/Roo_bootstrap_Navbar.js.html @@ -92,7 +92,7 @@ if(this.fireEvent('beforetoggle', this) === false){ return; } - var ce = this.el.select('.navbar-collapse',true).first(); + var ce = this.el.select('.roo-navbar-collapse',true).first(); if (!ce.hasClass('show')) { this.expand(); @@ -109,7 +109,7 @@ expand : function () { - var ce = this.el.select('.navbar-collapse',true).first(); + var ce = this.el.select('.roo-navbar-collapse',true).first(); if (ce.hasClass('collapsing')) { return; } @@ -141,7 +141,7 @@ */ collapse : function() { - var ce = this.el.select('.navbar-collapse',true).first(); + var ce = this.el.select('.roo-navbar-collapse',true).first(); if (ce.hasClass('collapsing') || ce.hasClass('collapse') ) { // it's collapsed or collapsing.. diff --git a/docs/src/Roo_bootstrap_Table.js.html b/docs/src/Roo_bootstrap_Table.js.html index 2095d13409..3aa9798b3e 100644 --- a/docs/src/Roo_bootstrap_Table.js.html +++ b/docs/src/Roo_bootstrap_Table.js.html @@ -594,8 +594,10 @@ c.html = '<i class="glyphicon"></i>' + c.html; } + // could use BS4 hidden-..-down + if(typeof(config.lgHeader) != 'undefined'){ - hh += '<span class="hidden-xs hidden-sm hidden-md">' + config.lgHeader + '</span>'; + hh += '<span class="hidden-xs hidden-sm hidden-md ">' + config.lgHeader + '</span>'; } if(typeof(config.mdHeader) != 'undefined'){ @@ -654,11 +656,15 @@ } if (!config[size]) { // 0 = hidden - c.cls += ' hidden-' + size; + // BS 4 '0' is treated as hide that column and below. + c.cls += ' hidden-' + size + ' hidden' + size + '-down'; return; } - c.cls += ' col-' + size + '-' + config[size]; + c.cls += ' col-' + size + '-' + config[size] + ( + size == 'xs' ? (' col-' + config[size] ) : '' // bs4 col-{num} replaces col-xs + ); + }); @@ -965,12 +971,18 @@ return; } + + if (!config[size]) { // 0 = hidden - td.cls += ' hidden-' + size; + // BS 4 '0' is treated as hide that column and below. + td.cls += ' hidden-' + size + ' hidden' + size + '-down'; return; } - td.cls += ' col-' + size + '-' + config[size]; + td.cls += ' col-' + size + '-' + config[size] + ( + size == 'xs' ? (' col-' + config[size] ) : '' // bs4 col-{num} replaces col-xs + ); + }); diff --git a/docs/src/Roo_bootstrap_TriggerField.js.html b/docs/src/Roo_bootstrap_TriggerField.js.html index 77b5ca2625..1a7506fe9b 100644 --- a/docs/src/Roo_bootstrap_TriggerField.js.html +++ b/docs/src/Roo_bootstrap_TriggerField.js.html @@ -22,7 +22,7 @@ trigger.applyTo('my-field'); * {@link Roo.bootstrap.DateField} and {@link Roo.bootstrap.ComboBox} are perfect examples of this. * @cfg {String} triggerClass An additional CSS class used to style the trigger button. The trigger will always get the * class 'x-form-trigger' by default and triggerClass will be <b>appended</b> if specified. - * @cfg {String} caret (search|calendar) a fontawesome for the trigger icon see http://fortawesome.github.io/Font-Awesome/icons/ + * @cfg {String} caret (search|calendar) BS3 only - carat fa name * @constructor * Create a new TriggerField. @@ -230,7 +230,7 @@ trigger.applyTo('my-field'); tag :'span', cls : 'input-group-addon input-group-append input-group-text btn dropdown-toggle', cn : [ - caret, + Roo.bootstrap.version == 3 ? caret : '', { tag: 'span', cls: 'combobox-clear', diff --git a/docs/symbols/Roo.bootstrap.ComboBox.json b/docs/symbols/Roo.bootstrap.ComboBox.json index 38c85d9970..3db79be3ae 100644 --- a/docs/symbols/Roo.bootstrap.ComboBox.json +++ b/docs/symbols/Roo.bootstrap.ComboBox.json @@ -739,7 +739,7 @@ { "name" : "caret", "type" : "String", - "desc" : "a fontawesome for the trigger icon see http://fortawesome.github.io/Font-Awesome/icons/", + "desc" : "BS3 only - carat fa name", "memberOf" : "Roo.bootstrap.TriggerField", "values" : [ "(search", diff --git a/docs/symbols/Roo.bootstrap.MoneyField.json b/docs/symbols/Roo.bootstrap.MoneyField.json index 8199782d72..5a7bbfafe9 100644 --- a/docs/symbols/Roo.bootstrap.MoneyField.json +++ b/docs/symbols/Roo.bootstrap.MoneyField.json @@ -806,7 +806,7 @@ { "name" : "caret", "type" : "String", - "desc" : "a fontawesome for the trigger icon see http://fortawesome.github.io/Font-Awesome/icons/", + "desc" : "BS3 only - carat fa name", "memberOf" : "Roo.bootstrap.TriggerField", "values" : [ "(search", diff --git a/docs/symbols/Roo.bootstrap.PhoneInput.json b/docs/symbols/Roo.bootstrap.PhoneInput.json index 8d0895ba56..75106e66aa 100644 --- a/docs/symbols/Roo.bootstrap.PhoneInput.json +++ b/docs/symbols/Roo.bootstrap.PhoneInput.json @@ -342,7 +342,7 @@ { "name" : "caret", "type" : "String", - "desc" : "a fontawesome for the trigger icon see http://fortawesome.github.io/Font-Awesome/icons/", + "desc" : "BS3 only - carat fa name", "memberOf" : "Roo.bootstrap.TriggerField", "values" : [ "(search", diff --git a/docs/symbols/Roo.bootstrap.TriggerField.json b/docs/symbols/Roo.bootstrap.TriggerField.json index 69a0b4be5b..a3ce20ac09 100644 --- a/docs/symbols/Roo.bootstrap.TriggerField.json +++ b/docs/symbols/Roo.bootstrap.TriggerField.json @@ -341,7 +341,7 @@ { "name" : "caret", "type" : "String", - "desc" : "a fontawesome for the trigger icon see http://fortawesome.github.io/Font-Awesome/icons/", + "desc" : "BS3 only - carat fa name", "memberOf" : "Roo.bootstrap.TriggerField", "values" : [ "(search", -- 2.39.2