Skip to content

Commit 5c3c155

Browse files
committed
updating to use latest jquery from a CDN
1 parent f20a5cf commit 5c3c155

File tree

6 files changed

+21
-7
lines changed

6 files changed

+21
-7
lines changed

app/views/layouts/application.html.erb

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424

2525
<%= favicon_link_tag 'favicon.ico' %>
2626
<%= stylesheet_link_tag "application", "https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic|Abel", "sticky-footer" %>
27+
<script
28+
src="https://code.jquery.com/jquery-3.4.1.min.js"
29+
integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
30+
crossorigin="anonymous"></script>
2731
<%= javascript_pack_tag 'application' %>
2832
<%= stylesheet_pack_tag 'application' %>
2933

app/views/layouts/cms.html.erb

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
</title>
2424
<%= favicon_link_tag 'favicon.ico' %>
2525
<%= stylesheet_link_tag "application", "https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic|Abel", "sticky-footer" %>
26+
<script
27+
src="https://code.jquery.com/jquery-3.4.1.min.js"
28+
integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
29+
crossorigin="anonymous"></script>
2630
<%= javascript_pack_tag 'application' %>
2731
<%= stylesheet_pack_tag 'application' %>
2832
<script>

app/views/layouts/cms_french.html.erb

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<%= favicon_link_tag 'favicon.ico' %>
2626
<%= stylesheet_link_tag "application", "https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic|Abel", "sticky-footer" %>
2727
<%= stylesheet_link_tag comfy_cms_render_css_path(1, "secondary-pages") %>
28+
<script
29+
src="https://code.jquery.com/jquery-3.4.1.min.js"
30+
integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
31+
crossorigin="anonymous"></script>
2832
<%= javascript_pack_tag 'application' %>
2933
<%= stylesheet_pack_tag 'application' %>
3034
<script>

app/views/layouts/french.html.erb

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
<%= favicon_link_tag 'favicon.ico' %>
1818

1919
<%= stylesheet_link_tag "application", "https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic|Abel" %>
20-
<%= javascript_pack_tag 'application' %>
20+
<script
21+
src="https://code.jquery.com/jquery-3.4.1.min.js"
22+
integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
23+
crossorigin="anonymous"></script>
24+
<%= javascript_pack_tag 'application' %>
2125
<%= stylesheet_pack_tag 'application' %>
2226
<script>
2327
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

app/views/layouts/home.html.erb

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
<%= favicon_link_tag 'favicon.ico' %>
1919

2020
<%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic|Abel" %>
21+
<script
22+
src="https://code.jquery.com/jquery-3.4.1.min.js"
23+
integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
24+
crossorigin="anonymous"></script>
2125
<%= javascript_pack_tag 'application' %>
2226
<%= stylesheet_pack_tag 'application' %>
2327
<script>

config/webpack/environment.js

-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,4 @@ const { environment } = require('@rails/webpacker')
22

33
const webpack = require('webpack');
44

5-
environment.plugins.append('Provide', new webpack.ProvidePlugin({
6-
$: 'jquery',
7-
jQuery: 'jquery',
8-
Popper: ['popper.js', 'default']
9-
}));
10-
115
module.exports = environment

0 commit comments

Comments
 (0)