mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-03 04:29:28 +01:00
Skip disabled widgets in iterateOver
This fixes disabled widgets returning their value unexpectedly, and ID collisions when we have 2 widgets with the same ID, but disable one.
This commit is contained in:
parent
ab195097f5
commit
46b7c5258b
@ -864,6 +864,11 @@ const Et2WidgetMixin = <T extends Constructor>(superClass : T) =>
|
|||||||
|
|
||||||
iterateOver(_callback : Function, _context, _type)
|
iterateOver(_callback : Function, _context, _type)
|
||||||
{
|
{
|
||||||
|
if(this.disabled)
|
||||||
|
{
|
||||||
|
// Don't if we're disabled
|
||||||
|
return;
|
||||||
|
}
|
||||||
if(typeof _type === "undefined" || _type === et2_widget || _type === Et2Widget ||
|
if(typeof _type === "undefined" || _type === et2_widget || _type === Et2Widget ||
|
||||||
typeof _type === 'function' && this instanceof _type ||
|
typeof _type === 'function' && this instanceof _type ||
|
||||||
et2_implements_registry[_type] && et2_implements_registry[_type](this))
|
et2_implements_registry[_type] && et2_implements_registry[_type](this))
|
||||||
|
Loading…
Reference in New Issue
Block a user