extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 20:31:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hide tooltips when context menu opens

Browse Source
This commit is contained in:
nathan 2023-09-13 14:05:50 -06:00
parent 2d81a67c9b
commit bf7106cf86
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/js/egw_action/EgwPopupActionImplementation.ts
View File

@ -11,12 +11,12 @@
import {_egw_active_menu, egwMenu, egwMenuItem} from "./egw_menu"; import {_egw_active_menu, egwMenu, egwMenuItem} from "./egw_menu";
import {EGW_KEY_ENTER, EGW_KEY_MENU} from "./egw_action_constants"; import {EGW_KEY_ENTER, EGW_KEY_MENU} from "./egw_action_constants";
import {tapAndSwipe} from "../tapandswipe"; import {tapAndSwipe} from "../tapandswipe";
import {EgwAction} from "./EgwAction";
import {EgwFnct} from "./egw_action_common"; import {EgwFnct} from "./egw_action_common";
import "./egwGlobal" import "./egwGlobal"
import {EgwActionImplementation} from "./EgwActionImplementation"; import {EgwActionImplementation} from "./EgwActionImplementation";
import {EgwActionObject} from "./EgwActionObject"; import {EgwActionObject} from "./EgwActionObject";
import {EgwPopupAction} from "./EgwPopupAction"; import {EgwPopupAction} from "./EgwPopupAction";
import {egw} from "../jsapi/egw_global";
export class EgwPopupActionImplementation implements EgwActionImplementation { export class EgwPopupActionImplementation implements EgwActionImplementation {
type = "popup"; type = "popup";
@ -243,6 +243,9 @@ export class EgwPopupActionImplementation implements EgwActionImplementation {
e = window.event; e = window.event;
} }
// Close any open tooltip so they don't get in the way
egw(window).tooltipCancel();
if (_egw_active_menu) { if (_egw_active_menu) {
_egw_active_menu.hide(); _egw_active_menu.hide();
} else if (!e.ctrlKey && e.which == 3 || e.which === 0 || e.type === 'tapandhold') // tap event indicates by 0 } else if (!e.ctrlKey && e.which == 3 || e.which === 0 || e.type === 'tapandhold') // tap event indicates by 0

9
api/js/jsapi/egw_tooltip.js
View File

@ -251,6 +251,15 @@ egw.extend('tooltip', egw.MODULE_WND_LOCAL, function(_app, _wnd)
tooltip_div.fadeOut(100); tooltip_div.fadeOut(100);
tooltip_div.remove(); tooltip_div.remove();
} }
},
/**
* Hide tooltip, cancel the timer
*/
tooltipCancel: function ()
{
hide();
current_elem = null;
} }
}; };