From: Alan Knowles Date: Wed, 12 May 2021 07:13:54 +0000 (+0800) Subject: sync X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=d7a702b4e31ca79b09b679aadaff84085db35eab sync --- diff --git a/docs/json/roodata.json b/docs/json/roodata.json index bf8e6e74a8..9bd92be106 100644 --- a/docs/json/roodata.json +++ b/docs/json/roodata.json @@ -20206,6 +20206,12 @@ ], "memberOf" : "Roo.bootstrap.Element" }, + { + "name" : "role", + "type" : "String", + "desc" : "default blank - set to button to force cursor pointer", + "memberOf" : "Roo.bootstrap.Element" + }, { "name" : "style", "type" : "String", @@ -20634,6 +20640,12 @@ ], "memberOf" : "Roo.bootstrap.Element" }, + { + "name" : "role", + "type" : "String", + "desc" : "default blank - set to button to force cursor pointer", + "memberOf" : "Roo.bootstrap.Element" + }, { "name" : "style", "type" : "String", @@ -21062,6 +21074,12 @@ ], "memberOf" : "Roo.bootstrap.Element" }, + { + "name" : "role", + "type" : "String", + "desc" : "default blank - set to button to force cursor pointer", + "memberOf" : "Roo.bootstrap.Element" + }, { "name" : "style", "type" : "String", @@ -28833,6 +28851,12 @@ ], "memberOf" : "Roo.bootstrap.Element" }, + { + "name" : "role", + "type" : "String", + "desc" : "default blank - set to button to force cursor pointer", + "memberOf" : "Roo.bootstrap.Element" + }, { "name" : "style", "type" : "String", @@ -29261,6 +29285,12 @@ ], "memberOf" : "" }, + { + "name" : "role", + "type" : "String", + "desc" : "default blank - set to button to force cursor pointer", + "memberOf" : "" + }, { "name" : "style", "type" : "String", @@ -43491,6 +43521,14 @@ "static" : false, "memberOf" : "Roo.Component" }, + { + "name" : "setHtml", + "type" : "function", + "desc" : "Set the HTML (text content) of the item", + "sig" : "(html)", + "static" : false, + "memberOf" : "" + }, { "name" : "setVisibilityEl", "type" : "function", @@ -45278,6 +45316,14 @@ "static" : false, "memberOf" : "Roo.Component" }, + { + "name" : "setHtml", + "type" : "function", + "desc" : "Set the HTML (text content) of the item", + "sig" : "(html)", + "static" : false, + "memberOf" : "Roo.bootstrap.NavItem" + }, { "name" : "setVisibilityEl", "type" : "function", diff --git a/docs/src/Roo_bootstrap_Card.js.html b/docs/src/Roo_bootstrap_Card.js.html index 10e645d97a..1ef63da5a5 100644 --- a/docs/src/Roo_bootstrap_Card.js.html +++ b/docs/src/Roo_bootstrap_Card.js.html @@ -149,6 +149,7 @@ headerEl : false, header_imageEl : false, + layoutCls : function() { var cls = ''; @@ -404,11 +405,11 @@ if (this.rotateable) { this.el.select('.card-header',true).on('click', this.onToggleRotate, this); } - this.collapsableEl = this.el.select('.roo-collapsable').first(); + this.collapsableEl = this.el.select('.roo-collapsable',true).first(); - this.footerEl = this.el.select('.card-footer').first(); - this.collapsableToggleEl = this.el.select('.roo-collapse-toggle'); - this.headerContainerEl = this.el.select('.roo-card-header-ctr').first(); + this.footerEl = this.el.select('.card-footer',true).first(); + this.collapsableToggleEl = this.el.select('.roo-collapse-toggle',true).first(); + this.headerContainerEl = this.el.select('.roo-card-header-ctr',true).first(); this.headerEl = this.el.select('.card-header',true).first(); if (this.rotated) { diff --git a/docs/src/Roo_bootstrap_Element.js.html b/docs/src/Roo_bootstrap_Element.js.html index 986f374f76..0d5b719a99 100644 --- a/docs/src/Roo_bootstrap_Element.js.html +++ b/docs/src/Roo_bootstrap_Element.js.html @@ -14,6 +14,8 @@ * @cfg {String} cls class of the element * @cfg {Boolean} preventDefault (true|false) default false * @cfg {Boolean} clickable (true|false) default false + * @cfg {String} role default blank - set to button to force cursor pointer + * * @constructor * Create a new Element @@ -45,6 +47,7 @@ preventDefault: false, clickable: false, tapedTwice : false, + role : false, getAutoCreate : function(){ @@ -53,6 +56,9 @@ // cls: this.cls, double assign in parent class Component.js :: onRender html: this.html }; + if (this.role !== false) { + cfg.role = this.role; + } return cfg; }, diff --git a/docs/src/Roo_bootstrap_NavItem.js.html b/docs/src/Roo_bootstrap_NavItem.js.html index 030a2cf9fa..bf938a3ebd 100644 --- a/docs/src/Roo_bootstrap_NavItem.js.html +++ b/docs/src/Roo_bootstrap_NavItem.js.html @@ -107,8 +107,10 @@ cfg.href = this.href; } if (this.fa) { - cfg.html = '<i class="fa fas fa-'+this.fa+'"></i> <span>' + this.html + '</span>'; - } + cfg.html = '<i class="fa fas fa-'+this.fa+'"></i> <span class="nav-html">' + this.html + '</span>'; + } else { + cfg.cls += " nav-html"; + } // menu .. should add dropdown-menu class - so no need for carat.. @@ -124,7 +126,8 @@ { tag: this.tagtype, href : this.href || "#", - html: this.html || '' + html: this.html || '', + cls : '' } ]; if (this.tagtype == 'a') { @@ -132,23 +135,21 @@ } if (this.icon) { - cfg.cn[0].html = '<i class="'+this.icon+'"></i> <span>' + cfg.cn[0].html + '</span>'; - } - if (this.fa) { - cfg.cn[0].html = '<i class="fa fas fa-'+this.fa+'"></i> <span>' + cfg.cn[0].html + '</span>'; - } - if(this.glyphicon) { + cfg.cn[0].html = '<i class="'+this.icon+'"></i> <span class="nav-html">' + cfg.cn[0].html + '</span>'; + } else if (this.fa) { + cfg.cn[0].html = '<i class="fa fas fa-'+this.fa+'"></i> <span class="nav-html">' + cfg.cn[0].html + '</span>'; + } else if(this.glyphicon) { cfg.cn[0].html = '<span class="glyphicon glyphicon-' + this.glyphicon + '"></span> ' + cfg.cn[0].html; - } + } else { + cfg.cn[0].cls += " nav-html"; + } if (this.menu) { - cfg.cn[0].html += " <span class='caret'></span>"; } if (this.badge !== '') { - cfg.cn[0].html += ' <span class="badge badge-secondary">' + this.badge + '</span>'; } } @@ -166,6 +167,7 @@ var ret = Roo.bootstrap.NavItem.superclass.onRender.call(this, ct, position); this.navLink = this.el.select('.nav-link',true).first(); + this.htmlEl = this.el.hasClass('nav-html') ? this.el : this.el.select('.nav-html',true).first(); return ret; }, @@ -363,6 +365,16 @@ Roo.get(c).scrollTo('top', options.value, true); return; + }, + /** + * Set the HTML (text content) of the item + * @param {string} html content for the nav item + */ + setHtml : function(html) + { + this.html = html; + this.htmlEl.dom.innerHTML = html; + } }); diff --git a/docs/src/Roo_data_ArrayReader.js.html b/docs/src/Roo_data_ArrayReader.js.html index 7966ceb4e0..7666b36da4 100644 --- a/docs/src/Roo_data_ArrayReader.js.html +++ b/docs/src/Roo_data_ArrayReader.js.html @@ -62,34 +62,34 @@ var myReader = new Roo.data.ArrayReader({ readRecords : function(o) { var sid = this.meta ? this.meta.id : null; - var recordType = this.recordType, fields = recordType.prototype.fields; - var records = []; - var root = o; - for(var i = 0; i < root.length; i++){ - var n = root[i]; - var values = {}; - var id = ((sid || sid === 0) && n[sid] !== undefined && n[sid] !== "" ? n[sid] : null); - for(var j = 0, jlen = fields.length; j < jlen; j++){ - var f = fields.items[j]; - var k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j; - var v = n[k] !== undefined ? n[k] : f.defaultValue; - v = f.convert(v); - values[f.name] = v; - } - var record = new recordType(values, id); - record.json = n; - records[records.length] = record; - } - return { - records : records, - totalRecords : records.length - }; + var recordType = this.recordType, fields = recordType.prototype.fields; + var records = []; + var root = o; + for(var i = 0; i < root.length; i++){ + var n = root[i]; + var values = {}; + var id = ((sid || sid === 0) && n[sid] !== undefined && n[sid] !== "" ? n[sid] : null); + for(var j = 0, jlen = fields.length; j < jlen; j++){ + var f = fields.items[j]; + var k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j; + var v = n[k] !== undefined ? n[k] : f.defaultValue; + v = f.convert(v); + values[f.name] = v; + } + var record = new recordType(values, id); + record.json = n; + records[records.length] = record; + } + return { + records : records, + totalRecords : records.length + }; }, // used when loading children.. @see loadDataFromChildren toLoadData: function(rec) { - // expect rec just to be an array.. eg [a,b,c, [...] << cn ] - return typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn; + // expect rec just to be an array.. eg [a,b,c, [...] << cn ] + return typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn; } diff --git a/docs/symbols/Roo.bootstrap.CardFooter.json b/docs/symbols/Roo.bootstrap.CardFooter.json index 6d6892f5bd..61c3f33bca 100644 --- a/docs/symbols/Roo.bootstrap.CardFooter.json +++ b/docs/symbols/Roo.bootstrap.CardFooter.json @@ -149,6 +149,13 @@ "memberOf" : "Roo.bootstrap.Component", "values" : [] }, + { + "name" : "role", + "type" : "String", + "desc" : "default blank - set to button to force cursor pointer", + "memberOf" : "Roo.bootstrap.Element", + "values" : [] + }, { "name" : "name", "type" : "string", diff --git a/docs/symbols/Roo.bootstrap.CardHeader.json b/docs/symbols/Roo.bootstrap.CardHeader.json index 88e74d67b3..9baf1724a4 100644 --- a/docs/symbols/Roo.bootstrap.CardHeader.json +++ b/docs/symbols/Roo.bootstrap.CardHeader.json @@ -149,6 +149,13 @@ "memberOf" : "Roo.bootstrap.Component", "values" : [] }, + { + "name" : "role", + "type" : "String", + "desc" : "default blank - set to button to force cursor pointer", + "memberOf" : "Roo.bootstrap.Element", + "values" : [] + }, { "name" : "name", "type" : "string", diff --git a/docs/symbols/Roo.bootstrap.CardImageTop.json b/docs/symbols/Roo.bootstrap.CardImageTop.json index 02668293c7..b297a05f97 100644 --- a/docs/symbols/Roo.bootstrap.CardImageTop.json +++ b/docs/symbols/Roo.bootstrap.CardImageTop.json @@ -149,6 +149,13 @@ "memberOf" : "Roo.bootstrap.Component", "values" : [] }, + { + "name" : "role", + "type" : "String", + "desc" : "default blank - set to button to force cursor pointer", + "memberOf" : "Roo.bootstrap.Element", + "values" : [] + }, { "name" : "name", "type" : "string", diff --git a/docs/symbols/Roo.bootstrap.DropTarget.json b/docs/symbols/Roo.bootstrap.DropTarget.json index 0ff53f9f43..f69f9fbfdd 100644 --- a/docs/symbols/Roo.bootstrap.DropTarget.json +++ b/docs/symbols/Roo.bootstrap.DropTarget.json @@ -156,6 +156,13 @@ "memberOf" : "Roo.bootstrap.DropTarget", "values" : [] }, + { + "name" : "role", + "type" : "String", + "desc" : "default blank - set to button to force cursor pointer", + "memberOf" : "Roo.bootstrap.Element", + "values" : [] + }, { "name" : "disableClass", "type" : "String", diff --git a/docs/symbols/Roo.bootstrap.Element.json b/docs/symbols/Roo.bootstrap.Element.json index bdb9b62aae..9904f2e08f 100644 --- a/docs/symbols/Roo.bootstrap.Element.json +++ b/docs/symbols/Roo.bootstrap.Element.json @@ -148,6 +148,13 @@ "memberOf" : "Roo.bootstrap.Component", "values" : [] }, + { + "name" : "role", + "type" : "String", + "desc" : "default blank - set to button to force cursor pointer", + "memberOf" : "Roo.bootstrap.Element", + "values" : [] + }, { "name" : "name", "type" : "string", diff --git a/docs/symbols/Roo.bootstrap.NavItem.json b/docs/symbols/Roo.bootstrap.NavItem.json index d44ce5225e..f1c3e340ef 100644 --- a/docs/symbols/Roo.bootstrap.NavItem.json +++ b/docs/symbols/Roo.bootstrap.NavItem.json @@ -286,6 +286,27 @@ } ] }, + { + "name" : "setHtml", + "desc" : "Set the HTML (text content) of the item", + "isStatic" : false, + "isConstructor" : false, + "isPrivate" : false, + "memberOf" : "Roo.bootstrap.NavItem", + "example" : "", + "deprecated" : "", + "since" : "", + "see" : "", + "params" : [ + { + "name" : "html", + "type" : "string", + "desc" : "content for the nav item", + "isOptional" : false + } + ], + "returns" : [] + }, { "name" : "hide", "desc" : "Hide a component - adds 'hidden' class", diff --git a/docs/symbols/Roo.bootstrap.NavSidebarItem.json b/docs/symbols/Roo.bootstrap.NavSidebarItem.json index 55b45c9a57..5febe20aff 100644 --- a/docs/symbols/Roo.bootstrap.NavSidebarItem.json +++ b/docs/symbols/Roo.bootstrap.NavSidebarItem.json @@ -287,6 +287,27 @@ } ] }, + { + "name" : "setHtml", + "desc" : "Set the HTML (text content) of the item", + "isStatic" : false, + "isConstructor" : false, + "isPrivate" : false, + "memberOf" : "Roo.bootstrap.NavItem", + "example" : "", + "deprecated" : "", + "since" : "", + "see" : "", + "params" : [ + { + "name" : "html", + "type" : "string", + "desc" : "content for the nav item", + "isOptional" : false + } + ], + "returns" : [] + }, { "name" : "hide", "desc" : "Hide a component - adds 'hidden' class",