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

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

diff --git a/config/initializers/browser.rb b/config/initializers/browser.rb
index 167fd293ca1ee63f36dc6a718d745232a47f8d70..5e8c57c74723167359edcd72de8c7973c3f69d94 100644 (file)
--- a/config/initializers/browser.rb
+++ b/config/initializers/browser.rb
@@ -1,16 +1,12 @@
 module OpenStreetMap
   module Browser
     module Features
 module OpenStreetMap
   module Browser
     module Features

-      def html5?
-        webkit? || firefox? || safari? || edge? || ie?(">8")
-      end
-
-      def es5?
-        webkit? || firefox? || safari? || edge? || ie?(">8")
+      def es6?
+        chrome?(">44") || firefox?(">24") || safari?(">7") || edge?(">11") || generic_webkit?

       end
 
       end
 

-      def es6?
-        webkit? || firefox? || safari? || edge?
+      def generic_webkit?
+        webkit? && !chrome? && !safari? && !edge? && !phantom_js?

       end
     end
   end
       end
     end
   end