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

Show browser context menu when you ctrl + right click

Browse Source
This commit is contained in:
Nathan Gray 2013-04-10 09:03:08 +00:00
parent 4c54745cbb
commit 93eacb1b13
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpgwapi/js/egw_action/egw_action_popup.js
View File

@ -235,18 +235,18 @@ function egwPopupActionImplementation()
{ {
_egw_active_menu.hide() _egw_active_menu.hide()
} }
else else if (!e.ctrlKey)
{ {
_xy = ai._getPageXY(e); _xy = ai._getPageXY(e);
_callback.call(_context, _xy, ai); _callback.call(_context, _xy, ai);
} }
e.cancelBubble = true; e.cancelBubble = !e.ctrlKey;
if (e.stopPropagation) if (e.stopPropagation && !e.ctrlKey)
{ {
e.stopPropagation(); e.stopPropagation();
} }
return false; return e.ctrlKey;
} }
if (egwIsMobile()) { if (egwIsMobile()) {

4
phpgwapi/js/egw_action/egw_keymanager.js
View File

@ -179,12 +179,14 @@ $j(document).ready(function() {
* Required to catch the context menu * Required to catch the context menu
*/ */
$j(window).on("contextmenu",document, function(event) { $j(window).on("contextmenu",document, function(event) {
if(egw_keyHandler(EGW_KEY_MENU, event.shiftKey, event.ctrlKey || event.metaKey, event.altKey)) if(!event.ctrlKey && egw_keyHandler(EGW_KEY_MENU, event.shiftKey, event.ctrlKey || event.metaKey, event.altKey))
{ {
// If the key handler successfully passed the key event to some // If the key handler successfully passed the key event to some
// sub component, prevent the default action // sub component, prevent the default action
event.preventDefault(); event.preventDefault();
return false;
} }
return true;
}); });