From 5a47d445e8c4f4012c12e5f0f185ba7680f99689 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 9 May 2010 09:41:38 +0000 Subject: [PATCH] "fix tiny mail window, because felamimail uses egw_getWindowOuterHeight() instead of a fixed height given as number" --- phpgwapi/inc/class.egw_framework.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 55e92d02fb..1df67e5194 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -403,7 +403,7 @@ abstract class egw_framework if (($popup = egw_link::is_popup($app,'add'))) { list($w,$h) = explode('x',$popup); - $action = "window.open('$link','_blank','width=$w,height=$h,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes');"; + $action = "window.open('$link','_blank','width='+$w+',height='+$h+',location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes');"; } else { @@ -679,14 +679,14 @@ abstract class egw_framework if ($GLOBALS['egw_info']['flags']['include_xajax']) { require_once(EGW_API_INC.'/xajax/xajax_core/xajax.inc.php'); - + $xajax = new xajax(); $xajax->configure('requestURI', egw::link('/xajax.php')); $xajax->configure('javascript URI',$GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/inc/xajax'); $xajax->configure('waitCursor',false); $xajax->register(XAJAX_FUNCTION,'doXMLHTTP'); $xajax->register(XAJAX_FUNCTION,'doXMLHTTP',array('mode' => "'synchronous'",'alias' => 'doXMLHTTPsync')); - + $java_script .= $xajax->getJavascript(); }