Merge remote-tracking branch 'origin/pr/908'

6 years ago · e76d44d957
parent 9413f1f489 4de26ac319
commit e76d44d957
3 changed files with 0 additions and 45 deletions
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp
@ -6,9 +6,6 @@
 <html><head>
     <%@ include file="head.jsp" %>
    <!--[if lt IE 7.]>
    <script defer type="text/javascript" src="script/pngfix.js"></script>
    <![endif]-->
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
@ -1,8 +1,5 @@
 <%@ include file="include.jsp" %>
 <!--[if lt IE 7.]>
 <script defer type="text/javascript" src="<c:url value="/script/pngfix.js"/>"></script>
 <![endif]-->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <c:set var="styleSheet"><spring:theme code="styleSheet"/></c:set>
 <link rel="apple-touch-icon" sizes="180x180" href="<c:url value="/icons/apple-touch-icon.png"/>"/>
--- a/airsonic-main/src/main/webapp/script/pngfix.js
+++ b/airsonic-main/src/main/webapp/script/pngfix.js
@ -1,39 +0,0 @@
 /*
 Correctly handle PNG transparency in Win IE 5.5 & 6.
 http://homepage.ntlworld.com/bobosola. Updated 18-Jan-2006.
 Use in <HEAD> with DEFER keyword wrapped in conditional comments:
 <!--[if lt IE 7]>
 <script defer type="text/javascript" src="pngfix.js"></script>
 <![endif]-->
 */
 var arVersion = navigator.appVersion.split("MSIE")
 var version = parseFloat(arVersion[1])
 if ((version >= 5.5) && (document.body.filters))
 {
   for(var i=0; i<document.images.length; i++)
   {
      var img = document.images[i]
      var imgName = img.src.toUpperCase()
      if (imgName.substring(imgName.length-3, imgName.length) == "PNG")
      {
         var imgID = (img.id) ? "id='" + img.id + "' " : ""
         var imgClass = (img.className) ? "class='" + img.className + "' " : ""
         var imgTitle = (img.title) ? "title='" + img.title + "' " : "title='" + img.alt + "' "
         var imgStyle = "display:inline-block;" + img.style.cssText
         if (img.align == "left") imgStyle = "float:left;" + imgStyle
         if (img.align == "right") imgStyle = "float:right;" + imgStyle
         if (img.parentElement.href) imgStyle = "cursor:hand;" + imgStyle
         var strNewHTML = "<span " + imgID + imgClass + imgTitle
         + " style=\"" + "width:" + img.width + "px; height:" + img.height + "px;" + imgStyle + ";"
         + "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader"
         + "(src=\'" + img.src + "\', sizingMethod='image');\"></span>"
         img.outerHTML = strNewHTML
         i = i-1
      }
   }
 }