extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Etemplate: Fix searchbox did not properly manage child DOM nodes

Browse Source
This commit is contained in:
nathangray 2020-07-08 14:34:40 -06:00
parent bcf9e1edee
commit 4fc02fbe20
2 changed files with 55 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
api/js/etemplate/et2_widget_textbox.js
View File

@ -367,19 +367,16 @@ var et2_searchbox = /** @class */ (function (_super) {
// Call the inherited constructor
_super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_searchbox._attributes, _child || {})) || this;
_this.value = "";
_this.value = "";
_this.div = jQuery(document.createElement('div'))
.addClass('et2_searchbox');
_this.flex = jQuery(document.createElement('div'))
.addClass('flex')
.appendTo(_this.div);
//this._super.apply(this, arguments);
_this.setDOMNode(_this.div[0]);
_this._createWidget();
return _this;
}
et2_searchbox.prototype._createWidget = function () {
et2_searchbox.prototype.createInputWidget = function () {
var self = this;
this.div = jQuery(document.createElement('div'))
.addClass('et2_searchbox');
this.flex = jQuery(document.createElement('div'))
.addClass('flex')
.appendTo(this.div);
this.setDOMNode(this.div[0]);
if (this.options.overlay)
this.flex.addClass('overlay');
// search button indicator
@ -433,7 +430,6 @@ var et2_searchbox = /** @class */ (function (_super) {
event.stopImmediatePropagation();
}
});
this.flex.append(this.search.getDOMNode());
// clear button implementation
this.clear = jQuery(document.createElement('span'))
.addClass('ui-icon clear')
@ -466,7 +462,7 @@ var et2_searchbox = /** @class */ (function (_super) {
if (this.options.fix)
return;
jQuery(this.flex).toggleClass('hide', !_stat);
jQuery(this.getDOMNode()).toggleClass('expanded', _stat);
jQuery(this.getDOMNode(this)).toggleClass('expanded', _stat);
};
/**
* toggle search button status based on value
@ -498,6 +494,12 @@ var et2_searchbox = /** @class */ (function (_super) {
if (this.search)
this.search.input.val(_value);
};
et2_searchbox.prototype.set_readonly = function (_readonly) {
this.search.set_readonly(_readonly);
};
et2_searchbox.prototype.set_blur = function (_value) {
this.search.set_blur(_value);
};
/**
* override doLoadingFinished in order to set initial state
*/
@ -512,6 +514,12 @@ var et2_searchbox = /** @class */ (function (_super) {
}
return true;
};
et2_searchbox.prototype.getDOMNode = function (asker) {
if (asker.getParent() == this) {
return this.flex[0];
}
return _super.prototype.getDOMNode.call(this, asker);
};
/**
* Overrride attachToDOM in order to unbind change handler
*/
@ -537,7 +545,7 @@ var et2_searchbox = /** @class */ (function (_super) {
name: "Fix searchbox",
type: "boolean",
default: true,
description: "Define wheter the searchbox should be a fix input field or flexible search button. Default is true (fix)."
description: "Define whether the searchbox should be a fix input field or flexible search button. Default is true (fix)."
}
};
return et2_searchbox;

55
api/js/etemplate/et2_widget_textbox.ts
View File

@ -421,7 +421,7 @@ class et2_searchbox extends et2_textbox
name:"Fix searchbox",
type:"boolean",
default:true,
description:"Define wheter the searchbox should be a fix input field or flexible search button. Default is true (fix)."
description:"Define whether the searchbox should be a fix input field or flexible search button. Default is true (fix)."
}
}
value: string = "";
@ -439,24 +439,20 @@ class et2_searchbox extends et2_textbox
{
// Call the inherited constructor
super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_searchbox._attributes, _child || {}));
this.value = "";
this.div = jQuery(document.createElement('div'))
.addClass('et2_searchbox');
this.flex = jQuery(document.createElement('div'))
.addClass('flex')
.appendTo(this.div);
//this._super.apply(this, arguments);
this.setDOMNode(this.div[0]);
this._createWidget();
}
_createWidget()
createInputWidget()
{
var self = this;
this.div = jQuery(document.createElement('div'))
.addClass('et2_searchbox');
this.flex = jQuery(document.createElement('div'))
.addClass('flex')
.appendTo(this.div);
this.setDOMNode(this.div[0]);
if (this.options.overlay) this.flex.addClass('overlay');
// search button indicator
// no need to create search button if it's a fix search field
if (!this.options.fix)
@ -511,7 +507,6 @@ class et2_searchbox extends et2_textbox
if (event.target.tagName == 'span') event.stopImmediatePropagation();
}
});
this.flex.append(this.search.getDOMNode());
// clear button implementation
this.clear = jQuery(document.createElement('span'))
@ -542,11 +537,11 @@ class et2_searchbox extends et2_textbox
*/
_show_hide(_stat)
{
// Not applied for fix option
if (this.options.fix) return;
// Not applied for fix option
if (this.options.fix) return;
jQuery(this.flex).toggleClass('hide',!_stat);
jQuery(this.getDOMNode()).toggleClass('expanded', _stat);
jQuery(this.flex).toggleClass('hide',!_stat);
jQuery(this.getDOMNode(this)).toggleClass('expanded', _stat);
}
/**
@ -590,6 +585,14 @@ class et2_searchbox extends et2_textbox
if (this.search) this.search.input.val(_value);
}
set_readonly(_readonly)
{
this.search.set_readonly(_readonly);
}
set_blur(_value)
{
this.search.set_blur(_value);
}
/**
* override doLoadingFinished in order to set initial state
*/
@ -597,16 +600,26 @@ class et2_searchbox extends et2_textbox
{
super.doLoadingFinished();
if (!this.get_value()) {
if (!this.get_value())
{
this._show_hide(false);
}
else {
else
{
this._show_hide(!this.options.overlay);
this._searchToggleState();
}
return true;
}
getDOMNode(asker)
{
if(asker.getParent() == this)
{
return this.flex[0];
}
return super.getDOMNode(asker);
}
/**
* Overrride attachToDOM in order to unbind change handler
*/