Merge remote-tracking branch 'upstream/pull/3149'

[rails.git] / config / initializers / browser.rb

diff --git a/config/initializers/browser.rb b/config/initializers/browser.rb
index 167fd293ca1ee63f36dc6a718d745232a47f8d70..ff0747d07005fc128aba2c3b412cabed10b48c1b 100644 (file)
--- a/config/initializers/browser.rb
+++ b/config/initializers/browser.rb
@@ -2,15 +2,19 @@ module OpenStreetMap
   module Browser
     module Features
       def html5?
-        webkit? || firefox? || safari? || edge? || ie?(">8")
+        chrome? || firefox? || safari? || edge? || ie?(">8") || generic_webkit?
       end
 
       def es5?
-        webkit? || firefox? || safari? || edge? || ie?(">8")
+        chrome? || firefox? || safari? || edge? || ie?(">8") || generic_webkit?
       end
 
       def es6?
-        webkit? || firefox? || safari? || edge?
+        chrome?(">44") || firefox?(">24") || safari?(">7") || edge?(">11") || generic_webkit?
+      end
+
+      def generic_webkit?
+        webkit? && !chrome? && !safari? && !edge? && !phantom_js?
       end
     end
   end