PNG Bugfix for IE 6 is working on IE 7 (browsercheck)

This commit is contained in:
Stefan Becker 2008-07-21 14:40:54 +00:00
parent dfa524628c
commit 8727151c9a
2 changed files with 57 additions and 57 deletions

View File

@ -230,8 +230,8 @@ class egw_framework
if(!$GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix']) if(!$GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'])
{ {
$pngfix_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/pngfix.js'; $pngfix_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/pngfix.js';
$pngfix ='<!-- This solves the Internet Explorer PNG-transparency bug, but only for IE 5.5 and higher --> $pngfix ='<!-- This solves the Internet Explorer PNG-transparency bug, but only for IE 5.5 - 6.0 and higher -->
<!--[if gte IE 5.5000]> <!--[if lt IE 7.0]>
<script src="'.$pngfix_src.'" type="text/javascript"> <script src="'.$pngfix_src.'" type="text/javascript">
</script> </script>
<![endif]-->'; <![endif]-->';

View File

@ -903,7 +903,7 @@ class html
} }
// This block makes pngfix.js useless, adding a check on disable_pngfix to have pngfix.js do its thing // This block makes pngfix.js useless, adding a check on disable_pngfix to have pngfix.js do its thing
if (self::$user_agent == 'msie' && self::$ua_version >= 5.5 && substr($url,-4) == '.png' && ($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] || !isset($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix']))) if (self::$user_agent == 'msie' && self::$ua_version < 7.0 && substr($url,-4) == '.png' && ($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] || !isset($GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'])))
{ {
$extra_styles = "display: inline-block; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='$url',sizingMethod='image'); width: 1px; height: 1px;"; $extra_styles = "display: inline-block; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='$url',sizingMethod='image'); width: 1px; height: 1px;";
if (false!==strpos($options,'style="')) if (false!==strpos($options,'style="'))