From 16d9b79965a13377e66dddbe60a4e62b570f5c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= Date: Wed, 19 May 2010 11:30:15 +0000 Subject: [PATCH] Fixed bug with FCKEditor and Safari in which the fck editor area isn't maximized --- phpgwapi/js/fckeditor/editor/fckeditor.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/phpgwapi/js/fckeditor/editor/fckeditor.html b/phpgwapi/js/fckeditor/editor/fckeditor.html index b6ada3e74e..597444f27d 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 ) { @@ -282,8 +282,11 @@ if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera ) var eInnerElement = oCell.firstChild ; if ( eInnerElement ) { - eInnerElement.style.height = '0px' ; - eInnerElement.style.height = ( oCell.scrollHeight - 2 ) + 'px' ; + eInnerElement.style.height = '0px'; + if (FCKBrowserInfo.IsGecko) + eInnerElement.style.height = ( oCell.scrollHeight - 2 ) + 'px' ; + else + eInnerElement.style.height = ( oCell.scrollHeight - 16 ) + 'px' ; } } }