From d58b746bf5d685417b724c6c8e260677e982e9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= Date: Wed, 19 May 2010 12:00:33 +0000 Subject: [PATCH] Fixed bug with FCKEditor and Safari in which the fck editor area isn't maximized --- phpgwapi/js/fckeditor/editor/fckeditor.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/phpgwapi/js/fckeditor/editor/fckeditor.html b/phpgwapi/js/fckeditor/editor/fckeditor.html index b6ada3e74e..2a54c0bd61 100644 --- a/phpgwapi/js/fckeditor/editor/fckeditor.html +++ b/phpgwapi/js/fckeditor/editor/fckeditor.html @@ -267,7 +267,7 @@ function WaitForActive( editorInstance, newStatus ) // Gecko browsers doesn't calculate well the IFRAME size so we must // recalculate it every time the window size changes. -if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera ) +if ((FCKBrowserInfo.IsGecko || FCKBrowserInfo.IsSafari) && !FCKBrowserInfo.IsOpera ) { window.onresize = function( e ) { @@ -283,7 +283,10 @@ if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera ) if ( eInnerElement ) { eInnerElement.style.height = '0px' ; - eInnerElement.style.height = ( oCell.scrollHeight - 2 ) + 'px' ; + if (FCKBrowserInfo.IsGecko) + eInnerElement.style.height = ( oCell.scrollHeight - 2 ) + 'px' ; + else + eInnerElement.style.height = ( oCell.scrollHeight - 16 ) + 'px' ; } } }