Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update turbolinks references to turbo #42

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update turbolinks references to turbo #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fc67c0
update turbolinks references to turbo
caitmich Oct 10, 2023
f8367f6
changelog
caitmich Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v4.x.x (Month 2023)
- Update turbolinks references to turbo

v4.10.0 (September 2023)
- Update views for compatibility with Font Awesome 6
- Update gemspec links
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/dradis/plugins/calculators/dread/calculator.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
input.toFixed(3)


document.addEventListener "turbolinks:load", ->
document.addEventListener "turbo:load", ->
if $('[data-behavior~=dread-buttons]').length
DREADCalculator.calculate()
$('input[type=radio]').on 'change', DREADCalculator.calculate
2 changes: 1 addition & 1 deletion app/assets/javascripts/dradis/plugins/calculators/dread/manifests/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//= require jquery
//= require turbolinks
//= require turbo

//= require dradis/plugins/calculators/dread/calculator
2 changes: 1 addition & 1 deletion app/views/dradis/plugins/calculators/dread/_tools_menu.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<%= link_to 'Risk Calculators - DREAD', dread_calculator.calculators_dread_path, class: 'dropdown-item', data: { turbolinks: false } %>
<%= link_to 'Risk Calculators - DREAD', dread_calculator.calculators_dread_path, class: 'dropdown-item', data: { turbo: false } %>
6 changes: 3 additions & 3 deletions app/views/layouts/dradis/plugins/calculators/dread/base.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html>
<head>
<title>DREAD Score Calculator | Dradis Framework</title>
<%= stylesheet_link_tag 'dradis/plugins/calculators/dread/manifests/application', media: 'all', 'data-turbolinks-track' => true %>
<%= javascript_include_tag 'dradis/plugins/calculators/dread/manifests/application', 'data-turbolinks-track' => true %>
<%= stylesheet_link_tag 'dradis/plugins/calculators/dread/manifests/application', media: 'all', 'data-turbo-track' => true %>
<%= javascript_include_tag 'dradis/plugins/calculators/dread/manifests/application', 'data-turbo-track' => true %>
<%= csrf_meta_tags %>

<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand All @@ -14,7 +14,7 @@
<a href="javascript:void(0)" class="navbar-brand">DREAD score calculator</a>
<ul class="navbar-nav pull-right">
<li class="nav-item">
<%= link_to main_app.root_path, class: 'nav-link', data: { turbolinks: false } do %>
<%= link_to main_app.root_path, class: 'nav-link', data: { turbo: false } do %>
Back to the app &rarr;
<% end %>
</li>
Expand Down