extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 09:28:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Etemplate: Fix tooltip didn't work on select+tag widget

Browse Source
This commit is contained in:
nathangray 2020-12-21 10:04:24 -07:00
parent ec7231dbd5
commit 5b5539584a
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/js/etemplate/et2_widget_selectbox.js
View File

@ -24,7 +24,6 @@ var __extends = (this && this.__extends) || (function () {
}; };
})(); })();
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.et2_menulist = exports.et2_selectbox_ro = exports.et2_selectbox = void 0;
/*egw:uses /*egw:uses
/vendor/bower-asset/jquery/dist/jquery.js; /vendor/bower-asset/jquery/dist/jquery.js;
/api/js/jquery/chosen/chosen.jquery.js; /api/js/jquery/chosen/chosen.jquery.js;
@ -185,6 +184,16 @@ var et2_selectbox = /** @class */ (function (_super) {
} }
return valid; return valid;
}; };
/**
* Overridden from parent to make sure tooltip handler is bound to the correct element
* if tags is on.
*/
et2_selectbox.prototype.getTooltipElement = function () {
if (this.input && (this.options.tags || this.options.search)) {
return jQuery(this.input.siblings()).get(0);
}
return this.getDOMNode(this);
};
/** /**
* Add an option to regular drop-down select * Add an option to regular drop-down select
* *
@ -617,6 +626,10 @@ var et2_selectbox = /** @class */ (function (_super) {
jQuery(v).addClass(self.options.value_class + v.value); jQuery(v).addClass(self.options.value_class + v.value);
}); });
} }
this.input.on('liszt:ready', function (evt, params) {
debugger;
this.set_statustext(this.statustext);
}.bind(this));
this.input.chosen({ this.input.chosen({
inherit_select_classes: true, inherit_select_classes: true,
search_contains: true, search_contains: true,

19
api/js/etemplate/et2_widget_selectbox.ts
View File

@ -288,6 +288,20 @@ export class et2_selectbox extends et2_inputWidget
return valid; return valid;
} }
/**
* Overridden from parent to make sure tooltip handler is bound to the correct element
* if tags is on.
*/
getTooltipElement(): HTMLElement
{
if(this.input && (this.options.tags || this.options.search))
{
return <HTMLElement><unknown> jQuery(this.input.siblings()).get(0);
}
return this.getDOMNode(this);
}
/** /**
* Add an option to regular drop-down select * Add an option to regular drop-down select
* *
@ -834,6 +848,10 @@ export class et2_selectbox extends et2_inputWidget
jQuery(v).addClass(self.options.value_class+v.value); jQuery(v).addClass(self.options.value_class+v.value);
}); });
} }
this.input.on('liszt:ready', function(evt, params) {
debugger;
this.set_statustext(this.statustext);
}.bind(this));
this.input.chosen({ this.input.chosen({
inherit_select_classes: true, inherit_select_classes: true,
search_contains: true, search_contains: true,
@ -868,7 +886,6 @@ export class et2_selectbox extends et2_inputWidget
self.change.call(self, self.input, self, _change); self.change.call(self, self.input, self, _change);
}); });
} }
// multi selection with limited show line of single row // multi selection with limited show line of single row
if (this.options.multiple && this.options.rows == 1 && this.options.height) if (this.options.multiple && this.options.rows == 1 && this.options.height)
{ {