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

Check popup blocker for when trying to open mail compose popup from filemamanger/Collabora

Browse Source
This commit is contained in:
Hadi Nategh
2021-05-17 16:27:51 +02:00
parent 107be6dab4
commit 67fb220778
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/js/jsapi/egw_open.js
View File

@ -514,8 +514,9 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
* @param {object} _content content to be passed to method
* @param {string|object} _extra url or object of extra
* @param {regex} _regexp regular expression to get specific popup with matched url
* @param {boolean} _check_popup_blocker TRUE check if browser pop-up blocker is on/off, FALSE no check
*/
openWithinWindow: function (_app, _method, _content, _extra, _regexp)
openWithinWindow: function (_app, _method, _content, _extra, _regexp, _check_popup_blocker)
{
var popups = window.framework.popups_get(_app, _regexp);
@ -554,7 +555,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
// Firefox:~ 65k, Safari:80k, Chrome: 2MB, Apache: 4k, Nginx: 4k
if (len > 2083)
{
var popup = egw.open('','mail','add','','compose__','mail');
var popup = egw.open('','mail','add','','compose__','mail', _check_popup_blocker);
var $tmpForm = jQuery(document.createElement('form'));
var $tmpSubmitInput = jQuery(document.createElement('input')).attr({type:"submit"});
for (var i in _extra)
@ -578,7 +579,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
}
else
{
egw.open('', _app, 'add', _extra, _app, _app);
egw.open('', _app, 'add', _extra, _app, _app, _check_popup_blocker);
}
};
for(var i = 0; i < popups.length; i++)