extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keep the default behavior for opening tel-url and make call_popup felixable to be able to get target

Browse Source
This commit is contained in:
Hadi Nategh 2016-10-27 14:17:42 +02:00
parent b59b44d29d
commit 84207e9a5a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,7 +352,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
if (mime_info.mime_target) _target = mime_info.mime_target;
}
if (_popup)
if (_popup && _popup.indexOf('x') > 0)
{
var w_h = _popup.split('x');
var popup_window = this.openPopup(url, w_h[0], w_h[1], _target || '_blank', _target_app, true);
@ -379,7 +379,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
{
_target = egwIsMobile()?'_self':'_blank';
}
_target = _target == '_phonecall'? '_self':_target;
_target = _target == '_phonecall' && _popup && _popup.indexOf('x') < 0 ? _popup:_target;
return _wnd.open(url, _target);
}
},