extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-16 13:03:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow to use "availHeight" in openPopup() too

Browse Source
This commit is contained in:
Ralf Becker 2015-02-06 16:44:00 +00:00
parent b9228c8fb5
commit ce479698e0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,7 +279,6 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
if (_popup) if (_popup)
{ {
var w_h = _popup.split('x'); var w_h = _popup.split('x');
if (w_h[1] == 'availHeight') w_h[1] = this.availHeight();
var popup_window = this.openPopup(url, w_h[0], w_h[1], _target || '_blank', _target_app, true); var popup_window = this.openPopup(url, w_h[0], w_h[1], _target || '_blank', _target_app, true);
// Remember which windows are open // Remember which windows are open
@ -321,6 +320,8 @@ egw.extend('open', egw.MODULE_WND_LOCAL, function(_egw, _wnd)
// Log for debugging purposes // Log for debugging purposes
egw.debug("navigation", "openPopup(%s, %s, %s, %o, %s, %s)",_url,_windowName,_width,_height,_status,_app); egw.debug("navigation", "openPopup(%s, %s, %s, %o, %s, %s)",_url,_windowName,_width,_height,_status,_app);
if (_height == 'availHeight') _height = this.availHeight();
// if we have a framework and we use mobile template --> let framework deal with opening popups // if we have a framework and we use mobile template --> let framework deal with opening popups
if (!_skip_framework && _wnd.framework) if (!_skip_framework && _wnd.framework)
{ {