Swap load order of javascript and importmap tags so Firefox 115 has w…

…orking turbo-rails again
Arie · Jul 8, 2023 · ee9825a · ee9825a
1 parent a0d3ac2
commit ee9825a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -6,8 +6,8 @@
     = stylesheet_link_tag    "application", :media => "all"
     = stylesheet_link_tag    "themes/black", :media => "all"
     = content_for(:stripe)
+    = javascript_importmap_tags("application", shim: false)
     = javascript_include_tag "serveme"
-    = javascript_importmap_tags
     = csrf_meta_tags
     = render 'shared/google_analytics'
     = render 'shared/fullstory'

diff --git a/app/views/layouts/rcon.html.haml b/app/views/layouts/rcon.html.haml
@@ -6,8 +6,8 @@
     = stylesheet_link_tag    "application", :media => "all"
     = stylesheet_link_tag    "themes/black", :media => "all"
     = content_for(:stripe)
-    = javascript_include_tag "serveme"
     = javascript_importmap_tags
+    = javascript_include_tag "serveme"
     = csrf_meta_tags
     = render 'shared/google_analytics'
     %meta{:name => "viewport",    :content => "width=device-width, initial-scale=1.0, shrink-to-fit=no"}