From: Alan Knowles Date: Wed, 23 Jun 2021 05:49:38 +0000 (+0800) Subject: Changed Roo/EventManager.jsdocs/src/Roo_bootstrap_ComboBox.js.html X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=840dbcd5f7ae6c34d4cc968d3639dd56b87f5b54 Changed Roo/EventManager.jsdocs/src/Roo_bootstrap_ComboBox.js.html --- diff --git a/Roo/EventManager.js b/Roo/EventManager.js index 3c9a41a0b8..d23defd6b4 100644 --- a/Roo/EventManager.js +++ b/Roo/EventManager.js @@ -124,7 +124,8 @@ Roo.EventManager = function(){ - var listen = function(element, ename, opt, fn, scope){ + var listen = function(element, ename, opt, fn, scope) + { var o = (!opt || typeof opt == "boolean") ? {} : opt; fn = fn || o.fn; scope = scope || o.scope; var el = Roo.getDom(element); @@ -181,7 +182,9 @@ Roo.EventManager = function(){ - E.on(el, ename, h); + E.on(el, ename, h); // this adds the actuall listener to the object.. + + if(ename == "mousewheel" && el.addEventListener){ // workaround for jQuery el.addEventListener("DOMMouseScroll", h, false); E.on(window, 'unload', function(){ diff --git a/docs/src/Roo_bootstrap_ComboBox.js.html b/docs/src/Roo_bootstrap_ComboBox.js.html index 99553928f4..e17b06f244 100644 --- a/docs/src/Roo_bootstrap_ComboBox.js.html +++ b/docs/src/Roo_bootstrap_ComboBox.js.html @@ -2327,16 +2327,21 @@ combobox.cls += ' roo-select2-container-multi'; } + var required = this.allowBlank ? { + tag : 'i', + style: 'display: none' + } : { + tag : 'i', + cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star', + tooltip : 'This field is required' + }; + var align = this.labelAlign || this.parentLabelAlign(); if (align ==='left' && this.fieldLabel.length) { cfg.cn = [ - { - tag : 'i', - cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star', - tooltip : 'This field is required' - }, + required, { tag: 'label', cls : 'control-label col-form-label', @@ -2366,12 +2371,8 @@ tag : 'span', html : this.fieldLabel }, - { - tag : 'i', - cls : 'roo-required-indicator right-indicator text-danger fa fa-lg fa-star', - tooltip : 'This field is required' - } - ] + required + ] }, { cls : "roo-combobox-wrap ", @@ -2419,11 +2420,7 @@ } else if ( this.fieldLabel.length) { cfg.cn = [ - { - tag : 'i', - cls : 'roo-required-indicator left-indicator text-danger fa fa-lg fa-star', - tooltip : 'This field is required' - }, + required, { tag: 'label', cls : 'control-label', @@ -2445,12 +2442,8 @@ cls : 'control-label', html : this.fieldLabel, cn : [ - { - tag : 'i', - cls : 'roo-required-indicator right-indicator text-danger fa fa-lg fa-star', - tooltip : 'This field is required' - } - ] + required + ] }, { cls : '',