holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix context menu not poping up in F.F

Browse Source
This commit is contained in:
Hadi Nategh 2014-12-17 10:34:27 +00:00
parent d3e404fad9
commit d9f6c03f8b
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/js/egw_action/egw_action.js
View File

@ -1917,7 +1917,7 @@ var EGW_AO_EXEC_THIS = 1;
* *
* @param {object} _implContext is data which should be delivered to the action implementation. * @param {object} _implContext is data which should be delivered to the action implementation.
* E.g. in case of the popup action implementation, the x and y coordinates where the * E.g. in case of the popup action implementation, the x and y coordinates where the
* menu should open are transmitted. * menu should open, and contextmenu event are transmitted.
* @param {string} _implType is the action type for which the implementation should be * @param {string} _implType is the action type for which the implementation should be
* executed. * executed.
* @param {number} _execType specifies in which context the execution should take place. * @param {number} _execType specifies in which context the execution should take place.

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

@ -262,7 +262,8 @@ function egwPopupActionImplementation()
else if (!e.ctrlKey && e.which == 3 || e.which === 0) // tap event indicates by 0 else if (!e.ctrlKey && e.which == 3 || e.which === 0) // tap event indicates by 0
{ {
var _xy = ai._getPageXY(e); var _xy = ai._getPageXY(e);
_callback.call(_context, _xy, ai); var _implContext = {event:e, posx:_xy.posx, posy: _xy.posy};
_callback.call(_context, _implContext, ai);
} }
e.cancelBubble = !e.ctrlKey || e.which == 1; e.cancelBubble = !e.ctrlKey || e.which == 1;
@ -622,21 +623,16 @@ function egwPopupActionImplementation()
var paste_action = mgr.getActionById('egw_paste'); var paste_action = mgr.getActionById('egw_paste');
// Fake UI so we can simulate the position of the drop // Fake UI so we can simulate the position of the drop
if(window.event) if(this._context.event)
{ {
var event = jQuery.Event(window.event);
var ui = { var ui = {
position: {top: 0, left: 0}, position: {top: 0, left: 0},
offset: {top: 0, left: 0} offset: {top: 0, left: 0}
}; };
if(event) var event = this._context.event.originalEvent;
{ ui.position = {top: event.pageY, left: event.pageX};
event = event.originalEvent; ui.offset = {top: event.offsetY, left: event.offsetX};
ui.position = {top: event.pageY, left: event.pageX};
ui.offset = {top: event.offsetY, left: event.offsetX};
}
} }
// Create default copy menu action // Create default copy menu action
if(drag && !jQuery.isEmptyObject(drag)) if(drag && !jQuery.isEmptyObject(drag))
{ {
@ -712,9 +708,9 @@ function egwPopupActionImplementation()
},true); },true);
clipboard_action.group = 2.5; clipboard_action.group = 2.5;
} }
var os_clipboard_caption = event.target.innerText.trim(); var os_clipboard_caption = this._context.event.originalEvent.target.innerHTML.trim();
clipboard_action.set_caption(egw.lang('Copy "%1"', os_clipboard_caption.length>20 ? os_clipboard_caption.substring(0,20)+'...':os_clipboard_caption)); clipboard_action.set_caption(egw.lang('Copy "%1"', os_clipboard_caption.length>20 ? os_clipboard_caption.substring(0,20)+'...':os_clipboard_caption));
clipboard_action.data.target = event.target; clipboard_action.data.target = this._context.event.originalEvent.target;
if(typeof _links[copy_action.id] == 'undefined') if(typeof _links[copy_action.id] == 'undefined')
{ {
_links[copy_action.id] = { _links[copy_action.id] = {