holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing column headers after changing nm row template

Browse Source
This commit is contained in:
nathangray 2020-03-30 12:22:07 -06:00
parent 8063d31183
commit cd530e6af0
4 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/js/etemplate/et2_core_DOMWidget.js
View File

@ -156,6 +156,25 @@ var et2_DOMWidget = /** @class */ (function (_super) {
} }
return false; return false;
}; };
/**
* Inserts a child at the given index.
*
* @param _node is the node which should be added. It has to be an instance
* of et2_widget
* @param _idx is the position at which the element should be added.
*/
et2_DOMWidget.prototype.insertChild = function (_node, _idx) {
_super.prototype.insertChild.call(this, _node, _idx);
if (_node.instanceOf(et2_DOMWidget) && typeof _node.hasOwnProperty('parentNode') && this.getDOMNode(this)) {
try {
_node.setParentDOMNode(this.getDOMNode(_node));
}
catch (_a) {
// Not ready to be added, usually due to construction order,
// will probably try again in doLoadingFinished()
}
}
};
et2_DOMWidget.prototype.isAttached = function () { et2_DOMWidget.prototype.isAttached = function () {
return this.parentNode != null; return this.parentNode != null;
}; };

25
api/js/etemplate/et2_core_DOMWidget.ts
View File

@ -250,6 +250,31 @@ export abstract class et2_DOMWidget extends et2_widget implements et2_IDOMNode
return false; return false;
} }
/**
* Inserts a child at the given index.
*
* @param _node is the node which should be added. It has to be an instance
* of et2_widget
* @param _idx is the position at which the element should be added.
*/
insertChild(_node : et2_widget, _idx: number)
{
super.insertChild(_node, _idx);
if(_node.instanceOf(et2_DOMWidget) && typeof _node.hasOwnProperty('parentNode') && this.getDOMNode(this))
{
try
{
(<et2_DOMWidget><unknown>_node).setParentDOMNode(this.getDOMNode(_node));
}
catch
{
// Not ready to be added, usually due to construction order,
// will probably try again in doLoadingFinished()
}
}
}
isAttached() { isAttached() {
return this.parentNode != null; return this.parentNode != null;
} }

9
api/js/etemplate/et2_core_widget.js
View File

@ -278,15 +278,6 @@ var et2_widget = /** @class */ (function (_super) {
} }
_node._parent = this; _node._parent = this;
this._children.splice(_idx, 0, _node); this._children.splice(_idx, 0, _node);
/*
Comment this out (for now)
if (_node.implements(et2_IDOMNode) && this.implements(et2_IDOMNode) && typeof _node.hasOwnProperty('parentNode') )
{
_node.detachFromDOM();
_node.parentNode = (<et2_IDOMNode><unknown>this).getDOMNode(_node);
_node.attachToDOM();
}
*/
} }
else { else {
this.egw().debug("error", "Widget " + _node._type + " is not supported by this widget class", this); this.egw().debug("error", "Widget " + _node._type + " is not supported by this widget class", this);

9
api/js/etemplate/et2_core_widget.ts
View File

@ -386,15 +386,6 @@ export class et2_widget extends ClassWithAttributes
_node._parent = this; _node._parent = this;
this._children.splice(_idx, 0, _node); this._children.splice(_idx, 0, _node);
/*
Comment this out (for now)
if (_node.implements(et2_IDOMNode) && this.implements(et2_IDOMNode) && typeof _node.hasOwnProperty('parentNode') )
{
_node.detachFromDOM();
_node.parentNode = (<et2_IDOMNode><unknown>this).getDOMNode(_node);
_node.attachToDOM();
}
*/
} else { } else {
this.egw().debug("error", "Widget " + _node._type + " is not supported by this widget class", this); this.egw().debug("error", "Widget " + _node._type + " is not supported by this widget class", this);
// throw("Widget is not supported by this widget class!"); // throw("Widget is not supported by this widget class!");