dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3916 from hardshell/bug/flot-widget-tooltip-not-hiding

Browse Source 
added - hide flot tooltip on chart destroying, prevent showing tooltip on flot hover, if edit mode is on.
This commit is contained in:
Igor Kulikov 2021-01-11 13:11:06 +02:00 committed by GitHub
commit d5e7019cfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/src/app/modules/home/components/widget/lib/flot-widget.ts
View File

@ -718,6 +718,10 @@ export class TbFlot {
public destroy() { public destroy() {
this.cleanup(); this.cleanup();
if (this.tooltip) {
this.tooltip.stop(true);
this.tooltip.hide();
}
if (this.plot) { if (this.plot) {
this.plot.destroy(); this.plot.destroy();
this.plot = null; this.plot = null;
@ -1170,7 +1174,7 @@ export class TbFlot {
if (!this.plot) { if (!this.plot) {
return; return;
} }
if (!this.tooltipIndividual || item) { if ((!this.tooltipIndividual || item) && !this.ctx.isEdit) {
const multipleModeTooltip = !this.tooltipIndividual; const multipleModeTooltip = !this.tooltipIndividual;
if (multipleModeTooltip) { if (multipleModeTooltip) {
this.plot.unhighlight(); this.plot.unhighlight();