scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-15 17:44:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

Revert to using intermediate jquery_bundle file [SCI-9031] (#5962)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-08-10 17:19:28 +02:00 • committed by GitHub
parent c6a545d8b3
commit a4ea995027
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/jquery_bundle.js vendored Normal file
View file

@ -0,0 +1 @@
//= require jquery

2
app/views/layouts/application.html.erb
View file

@ -17,7 +17,7 @@
<% if ::NewRelic::Agent.instance.started? %>
<%= ::NewRelic::Agent.browser_timing_header(controller.request.content_security_policy_nonce) %>
<% end %>
<%= javascript_include_tag 'jquery' %>
<%= javascript_include_tag 'jquery_bundle' %>
<%= javascript_include_tag 'application_pack' %>
<%= javascript_include_tag 'application' %>

2
app/views/layouts/protocols/print.html.erb
View file

@ -3,7 +3,7 @@
<head>
<title><%= t("protocols.print.title") %></title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<%= javascript_include_tag 'jquery' %>
<%= javascript_include_tag 'jquery_bundle' %>
<%= javascript_include_tag 'application' %>
<%= javascript_include_tag "handsontable.full" %>
<%= render 'shared/formulas_libraries' %>

2
app/views/layouts/shareable_links.html.erb
View file

@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
<%= stylesheet_link_tag 'application', media: 'all' %>
<%= javascript_include_tag 'jquery' %>
<%= javascript_include_tag 'jquery_bundle' %>
<%= javascript_include_tag 'application' %>
<%= javascript_include_tag 'application_pack' %>

2
app/views/layouts/sign_in_halt.html.erb
View file

@ -12,7 +12,7 @@
<%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
<%= stylesheet_link_tag 'application_pack', media: 'all' %>
<%= javascript_include_tag 'jquery' %>
<%= javascript_include_tag 'jquery_bundle' %>
<%= javascript_include_tag 'application' %>
<%= javascript_include_tag 'application_pack_styles' %>
<%= stylesheet_link_tag 'application', media: 'all' %>

3
config/initializers/assets.rb
View file

@ -136,5 +136,8 @@ Rails.application.config.assets.precompile += %w(ruleJS.js)
Rails.application.config.assets.precompile += %w(handsontable.formula.js)
Rails.application.config.assets.precompile += %w(big.min.js)
# JQuery related includes
Rails.application.config.assets.precompile += %w(jquery_bundle.js)
# Add stuff installed by yarn
Rails.application.config.assets.paths << Rails.root.join('node_modules')