From: Tom Hughes <tom@compton.nu>
Date: Wed, 30 Jan 2019 12:01:00 +0000 (+0000)
Subject: Replace conditional comments with browser detection
X-Git-Tag: live~2737^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9c83235f72aece554426751e334c1f0b4ccaea64

Replace conditional comments with browser detection
---

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 56c3051b2..c06b01ed1 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,15 +1,13 @@
 <%= content_tag :head, :data => application_data do %>
   <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
-  <!--[if lt IE 9]><%= javascript_include_tag "html5shiv" %><![endif]-->
+  <%= javascript_include_tag "html5shiv" unless browser.html5? %>
   <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "i18n/" + I18n.locale.to_s %>
   <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %>
   <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
   <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>
-  <!--[if IE]>
-    <%= favicon_link_tag "favicon.ico" %>
-  <![endif]-->
+  <%= favicon_link_tag "favicon.ico" if browser.ie? %>
   <% [57, 60, 72, 76, 114, 120, 144, 152, 180].each do |size| -%>
   <%= favicon_link_tag "apple-touch-icon-#{size}x#{size}.png", :rel => "apple-touch-icon", :sizes => "#{size}x#{size}", :type => "image/png" %>
   <% end -%>