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

Try to open contents, which have no mime type registered, properly in different browsing environments

Browse Source
This commit is contained in:
Hadi Nategh 2015-03-26 13:41:16 +00:00
parent 186a6b968f
commit 585d42dbde
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpgwapi/js/jsapi/egw_open.js
View File

@ -321,6 +321,7 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
if (mime_info.mime_popup) _popup = mime_info.mime_popup; if (mime_info.mime_popup) _popup = mime_info.mime_popup;
if (mime_info.mime_target) _target = mime_info.mime_target; if (mime_info.mime_target) _target = mime_info.mime_target;
} }
if (_popup) if (_popup)
{ {
var w_h = _popup.split('x'); var w_h = _popup.split('x');
@ -333,16 +334,30 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
} }
else if ((typeof _target == 'undefined' || _target == '_self' || typeof this.link_app_list()[_target] != "undefined")) else if ((typeof _target == 'undefined' || _target == '_self' || typeof this.link_app_list()[_target] != "undefined"))
{ {
// No mime type registered, set target properly based on browsing environment
if (!mime_info)
{
_target = egwIsMobile()?'_self':'_blank';
}
if(_target == '_self') if(_target == '_self')
{ {
// '_self' isn't allowed, but we can handle it // '_self' isn't allowed, but we can handle it
_target = undefined; _target = undefined;
} }
else
{
return _wnd.open(url, _target);
}
// Use framework's link handler, if present // Use framework's link handler, if present
return this.link_handler(url,_target); return this.link_handler(url,_target);
} }
else else
{ {
// No mime type registered, set target properly based on browsing environment
if (!mime_info)
{
_target = egwIsMobile()?'_self':'_blank';
}
return _wnd.open(url, _target); return _wnd.open(url, _target);
} }
}, },