Merge pull request #3449 from projectblacklight/drop-bs-4-dismiss-icon

Remove BS4 dismiss icon and data attribute

app/components/spotlight/save_search_component.html.erb

@@ -5,9 +5,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title" id="save-modal-label"><%= t(:'spotlight.saved_search.label') %></h4>
-        <button type="button" class="blacklight-modal-close close btn-close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-          <span aria-hidden="true" class="visually-hidden">&times;</span>
-        </button>
+        <button type="button" class="blacklight-modal-close close btn-close" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>"></button>
       </div>
       <div class="modal-body">
         <%= f.text_field :title, label: t(:'spotlight.saved_search.title') %>
@@ -17,7 +15,7 @@
       </div>
       <div class="modal-footer d-flex flex-row-reverse justify-content-start">
         <%= f.submit nil, class: 'btn btn-primary' %>
-        <button type="button" class="btn btn-link" data-dismiss="modal" data-bs-dismiss="modal"><%= t :cancel %></button>
+        <button type="button" class="btn btn-link" data-bs-dismiss="modal"><%= t :cancel %></button>
       </div>
     </div>
     <% end %>

app/javascript/spotlight/controllers/tag_selector_controller.js

@@ -194,7 +194,7 @@ export default class extends Controller {
               data-tag="${tag}"
               class="btn-close close ms-1 ml-1"
               aria-label="${this.translationsValue.remove} ${tag}"
-            ><span aria-hidden="true" class="visually-hidden">&times;</span></button>
+            ></button>
           </span>
         </li>
       `

app/javascript/spotlight/user/zpr_links.js

@@ -10,7 +10,7 @@ export default class {
       modalContent.html('<div id="osd-modal-container"></div>');
       var controls = `<div class="controls d-flex justify-content-center justify-content-md-end">
           <div class="custom-close-controls pr-3 pe-3 pt-3">
-            <button type="button" class="btn btn-dark" data-dismiss="modal" data-bs-dismiss="modal" aria-hidden="true">${Spotlight.ZprLinks.close}</button>
+            <button type="button" class="btn btn-dark" data-bs-dismiss="modal" aria-hidden="true">${Spotlight.ZprLinks.close}</button>
           </div>
           <div class="zoom-controls mb-3 mr-md-3 me-md-3">
             <button id="osd-zoom-in" type="button" class="btn btn-dark">${Spotlight.ZprLinks.zoomIn}</button>

app/views/catalog/_add_tags.html.erb

@@ -4,9 +4,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title" id="add-tag-modal"><%= t(:'spotlight.bulk_actions.add_tags.heading') %></h4>
-        <button type="button" class="blacklight-modal-close close btn-close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-          <span aria-hidden="true" class="visually-hidden">&times;</span>
-        </button>
+        <button type="button" class="blacklight-modal-close close btn-close" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>"></button>
       </div>
       <div class="modal-body">
         <p>
@@ -20,7 +18,7 @@
       </div>
       <div class="modal-footer d-flex flex-row-reverse justify-content-start">
         <%= f.submit t(:'spotlight.bulk_actions.add'), class: 'btn btn-primary', data: { confirm: t(:'spotlight.bulk_actions.confirm'), turbo_confirm: t(:'spotlight.bulk_actions.confirm') } %>
-        <button type="button" class="btn btn-link" data-dismiss="modal" data-bs-dismiss="modal"><%= t :cancel %></button>
+        <button type="button" class="btn btn-link" data-bs-dismiss="modal"><%= t :cancel %></button>
       </div>
     </div>
     <% end %>

app/views/catalog/_change_visibility.html.erb

@@ -4,9 +4,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title" id="save-modal-label"><%= t(:'spotlight.bulk_actions.change_visibility.heading') %></h4>
-        <button type="button" class="blacklight-modal-close close btn-close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-          <span aria-hidden="true" class="visually-hidden">&times;</span>
-        </button>
+        <button type="button" class="blacklight-modal-close close btn-close" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>"></button>
       </div>
       <div class="modal-body">
         <p>
@@ -27,7 +25,7 @@
       </div>
       <div class="modal-footer d-flex flex-row-reverse justify-content-start">
         <%= f.submit t(:'spotlight.bulk_actions.change'), class: 'btn btn-primary', data: { confirm: t(:'spotlight.bulk_actions.confirm'), turbo_confirm: t(:'spotlight.bulk_actions.confirm') } %>
-        <button type="button" class="btn btn-link" data-dismiss="modal" data-bs-dismiss="modal"><%= t :cancel %></button>
+        <button type="button" class="btn btn-link" data-bs-dismiss="modal"><%= t :cancel %></button>
       </div>
     </div>
     <% end %>

app/views/catalog/_remove_tags.html.erb

@@ -4,9 +4,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title" id="remove-tag-modal"><%= t(:'spotlight.bulk_actions.remove_tags.heading') %></h4>
-        <button type="button" class="blacklight-modal-close close btn-close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-          <span aria-hidden="true" class="visually-hidden">&times;</span>
-        </button>
+        <button type="button" class="blacklight-modal-close close btn-close" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>"></button>
       </div>
       <div class="modal-body">
         <%= t(:'spotlight.bulk_actions.remove_tags.description_html', count: @response.total) %>
@@ -29,7 +27,7 @@
       </div>
       <div class="modal-footer d-flex flex-row-reverse justify-content-start">
         <%= f.submit t(:'spotlight.bulk_actions.remove'), class: 'btn btn-primary', data: { confirm: t(:'spotlight.bulk_actions.confirm'), turbo_confirm: t(:'spotlight.bulk_actions.confirm') } %>
-        <button type="button" class="btn btn-link" data-dismiss="modal" data-bs-dismiss="modal"><%= t :cancel %></button>
+        <button type="button" class="btn btn-link" data-bs-dismiss="modal"><%= t :cancel %></button>
       </div>
     </div>
     <% end %>

app/views/spotlight/locks/_lock.html.erb

@@ -1,4 +1,4 @@
 <p class="alert alert-warning alert-lock">
-  <button type="button" class="close btn-close" data-dismiss="alert" data-bs-dismiss="alert"><span aria-hidden="true" class="visually-hidden">&times;</span><span class="sr-only visually-hidden">Close</span></button>
+  <button type="button" class="close btn-close" data-bs-dismiss="alert"><span class="sr-only visually-hidden">Close</span></button>
   <%= t :'spotlight.pages.edit.locked', user: lock.by, created_at: time_ago_in_words(lock.created_at) + " ago"%>
 </p>