From 5fc67c08acc9012a71f297bc0e00356a984ac298 Mon Sep 17 00:00:00 2001 From: Caitlin Date: Tue, 10 Oct 2023 18:06:47 -0400 Subject: [PATCH 1/2] update turbolinks references to turbo --- .../dradis/plugins/calculators/dread/calculator.js.coffee | 2 +- .../plugins/calculators/dread/manifests/application.js | 2 +- .../dradis/plugins/calculators/dread/_tools_menu.html.erb | 2 +- .../layouts/dradis/plugins/calculators/dread/base.html.erb | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/dradis/plugins/calculators/dread/calculator.js.coffee b/app/assets/javascripts/dradis/plugins/calculators/dread/calculator.js.coffee index cb238f3..63a1687 100644 --- a/app/assets/javascripts/dradis/plugins/calculators/dread/calculator.js.coffee +++ b/app/assets/javascripts/dradis/plugins/calculators/dread/calculator.js.coffee @@ -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 diff --git a/app/assets/javascripts/dradis/plugins/calculators/dread/manifests/application.js b/app/assets/javascripts/dradis/plugins/calculators/dread/manifests/application.js index 256cbff..99e3661 100644 --- a/app/assets/javascripts/dradis/plugins/calculators/dread/manifests/application.js +++ b/app/assets/javascripts/dradis/plugins/calculators/dread/manifests/application.js @@ -1,4 +1,4 @@ //= require jquery -//= require turbolinks +//= require turbo //= require dradis/plugins/calculators/dread/calculator diff --git a/app/views/dradis/plugins/calculators/dread/_tools_menu.html.erb b/app/views/dradis/plugins/calculators/dread/_tools_menu.html.erb index 66f8ac1..1b2bd5d 100644 --- a/app/views/dradis/plugins/calculators/dread/_tools_menu.html.erb +++ b/app/views/dradis/plugins/calculators/dread/_tools_menu.html.erb @@ -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 } %> diff --git a/app/views/layouts/dradis/plugins/calculators/dread/base.html.erb b/app/views/layouts/dradis/plugins/calculators/dread/base.html.erb index d4c170d..e31ae4d 100644 --- a/app/views/layouts/dradis/plugins/calculators/dread/base.html.erb +++ b/app/views/layouts/dradis/plugins/calculators/dread/base.html.erb @@ -2,8 +2,8 @@ DREAD Score Calculator | Dradis Framework - <%= 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 %> @@ -14,7 +14,7 @@ DREAD score calculator