From fabe4e2f55e53d023b95137d90228a28e2c37e76 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 27 Oct 2016 14:17:42 +0200 Subject: [PATCH] Keep the default behavior for opening tel-url and make call_popup felixable to be able to get target --- api/js/jsapi/egw_open.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/js/jsapi/egw_open.js b/api/js/jsapi/egw_open.js index aee95865e3..6e38fe94ba 100644 --- a/api/js/jsapi/egw_open.js +++ b/api/js/jsapi/egw_open.js @@ -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); } },