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

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

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

-      def html5?
-        chrome? || firefox? || safari? || edge? || ie?(">8") || generic_webkit?
-      end
-
-      def es5?
-        chrome? || firefox? || safari? || edge? || ie?(">8") || generic_webkit?
-      end
-

       def es6?
         chrome?(">44") || firefox?(">24") || safari?(">7") || edge?(">11") || generic_webkit?
       end
 
       def generic_webkit?
       def es6?
         chrome?(">44") || firefox?(">24") || safari?(">7") || edge?(">11") || generic_webkit?
       end
 
       def generic_webkit?

-        webkit? && !chrome? && !safari? && !edge?
+        webkit? && !chrome? && !safari? && !edge? && !phantom_js?

       end
     end
   end
       end
     end
   end