From a528505f44a09c6cdd769400ce93f7ddb6503efc Mon Sep 17 00:00:00 2001 From: cajus Date: Sat, 1 May 2010 17:42:11 +0000 Subject: [PATCH] Reverted changes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18012 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/include/gosa.js | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/gosa-core/html/include/gosa.js b/gosa-core/html/include/gosa.js index 61096caea..25df0a08b 100644 --- a/gosa-core/html/include/gosa.js +++ b/gosa-core/html/include/gosa.js @@ -251,26 +251,22 @@ function divGOsa_toggle(element) { function resizeHandler (e) { if (!e) e= window.event; - var contentHeight= document.viewport.getHeight() - 216; - if ($$('div.plugin-actions').length != 0) { - var height= 0; - $$('div.plugin-actions').each(function(s) { - height+= s.getHeight(); - }); - contentHeight-= height + 5; - } - - // For WebKit #3239 has to be resolved by Apple, then it works - // in Webkit / Gecko based browsers - if (Prototype.Browser.Gecko || Prototype.Browser.WebKit){ - if ($("d_scrollbody") && $("t_nscrollbody")) { - document.getElementById('d_scrollbody').style.height = contentHeight+23+'px'; - document.getElementById('t_nscrollbody').style.height = contentHeight+'px'; + // This works with FF / IE9. If Apples resolves a bug in webkit, + // it works with Safari/Chrome, too. + if ($("d_scrollbody") && $("t_nscrollbody")) { + var contentHeight= document.viewport.getHeight() - 216; + if ($$('div.plugin-actions').length != 0) { + var height= 0; + $$('div.plugin-actions').each(function(s) { + height+= s.getHeight(); + }); + contentHeight-= height + 5; } - } else { - document.getElementById('d_scrollbody').style.minHeight = contentHeight+23+'px'; - document.getElementById('t_nscrollbody').style.minHeight = contentHeight+'px'; + + document.getElementById('d_scrollbody').style.height = contentHeight+23+'px'; + document.getElementById('t_nscrollbody').style.height = contentHeight+'px'; } + return true; } -- 2.30.2