decidim-core 0.30.5 → 0.30.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8792833d7ba900781bcd99e714b0fc117c8bf63b1d92894a12a4d8d9eebfcab
-  data.tar.gz: 21ae4185554af11eb516c1e7e0b6af616497331ab28234bd1c5199636fe40402
+  metadata.gz: 5110ff22ed67aef95bf387023ec7d18d9602a92944c82c2ab9373e786c04393c
+  data.tar.gz: b754a2b2ddb4a72ae07dcd384203d61454ced7f6a3a41a4f80a5bb501b3dc310
 SHA512:
-  metadata.gz: 8d56c970e80a667e474858352900d599b48dc392d99c239e3ea732af530f457cbe0a72276b9da630e5aff999eff6585dbe8ce7a8da66346df7ee491901366d59
-  data.tar.gz: aba95c516675ae9eff886fb93c4c29c94fede6adb809c26aa2fb2bf17fde468c7e1a7f9a8875708f13061595410f0dfaff83938ff7ff011682b8011f1e99d776
+  metadata.gz: 3659a2a34d2531735e1a03710329261952c724361d0661bb9cf02c7a2acc76c2516266e8030a82e4dcc40789361d67845f1421addfcbf0f1fe4e0743a1288572
+  data.tar.gz: 9ec948751168cd3f4a8cc2b768be6a118cd22b47aecb0712fa64a1c01d58a5cdf2b7f2f20963fdd0eec2384a41753bbaec558016f533bfab7176227df6f3cadd

data/app/cells/decidim/announcement_cell.rb

@@ -68,15 +68,23 @@ module Decidim
     def clean_body
       return unless body
 
-      Array(body).map { |paragraph| tag.p(clean(paragraph)) }.join
+      Array(body).map { |paragraph| clean(paragraph) }.join
     end
 
     def clean_announcement
+      return if announcement.is_a?(Hash) && announcement.values.all?(&:blank?)
+
       clean(announcement)
     end
 
     def clean(value)
-      decidim_sanitize_admin(translated_attribute(value))
+      return if value.blank? || value.nil?
+
+      if value.include?("rich-text-display")
+        decidim_sanitize_admin(translated_attribute(value))
+      else
+        tag.p(decidim_sanitize_admin(translated_attribute(value)))
+      end
     end
   end
 end

data/app/cells/decidim/attachments_file_tab/show.erb

@@ -1,3 +1,3 @@
 <div class="row column">
-  <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
+  <%= form.upload :file, attachments: form.object.file.present? ? [form.object.file] : [], button_class: "button button__sm button__transparent-secondary" %>
 </div>

data/app/cells/decidim/content_blocks/highlighted_elements_with_cell_for_list_cell.rb

@@ -19,10 +19,14 @@ module Decidim
         @list_cell ||= cell(
           list_cell_path,
           published_components.one? ? published_components.first : published_components,
-          **model.settings.to_h, see_all_path:
+          **model.settings.to_h, **extra_list_cell_options, see_all_path:
         )
       end
 
+      def extra_list_cell_options
+        {}
+      end
+
       def see_all_path; end
     end
   end

data/app/cells/decidim/content_blocks/participatory_space_metadata/content.erb

@@ -2,9 +2,9 @@
   <% metadata_valued_items.each do |item| %>
     <div class="participatory-space__metadata-item">
       <div class="participatory-space__metadata-item-title">
-        <span><%= item[:title] %></span>
+        <p><%= item[:title] %></p>
       </div>
-      <span><%= item[:value] %></span>
+      <p><%= item[:value] %></p>
     </div>
   <% end %>
 </div>

data/app/cells/decidim/nav_links/show.erb

@@ -4,11 +4,11 @@
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>
   </button>
-  <ul id="dropdown-menu-participatory-space" class="participatory-space__nav">
+  <ul id="dropdown-menu-participatory-space" class="participatory-space__nav" aria-hidden="true">
     <% model.each do |item| %>
       <li role="menuitem">
         <%= link_to item[:url], class: "participatory-space__nav-item" do %>
-          <%= item[:name] %>
+          <%= decidim_escape_translated(item[:name]) %>
           <%= icon "arrow-right-line" %>
         <% end %>
       </li>

data/app/cells/decidim/report_button/already_reported_modal.erb

@@ -1,7 +1,7 @@
 <%= decidim_modal id: modal_id, class: "flag-modal" do %>
   <div data-dialog-container>
     <%= icon "flag-line" %>
-    <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+    <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
     <div>
       <div class="form__wrapper flag-modal__form">
         <p class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.already_reported") %></p>

data/app/cells/decidim/report_button/flag_modal.erb

@@ -2,7 +2,7 @@
   <%= form_for report_form, builder:, url: report_path, method: :post, html: { id: nil } do |f| %>
     <div data-dialog-container>
       <%= icon "flag-line" %>
-      <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+      <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
       <div>
         <div class="form__wrapper flag-modal__form">
           <p id="dialog-desc-<%= modal_id %>" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.description") %></p>

data/app/cells/decidim/report_user_button/already_reported_modal.erb

@@ -1,7 +1,7 @@
 <%= decidim_modal id: modal_id, class: "flag-user-modal" do %>
   <div data-dialog-container>
     <%= icon "flag-line" %>
-    <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
+    <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
     <div>
       <div class="form__wrapper flag-modal__form">
         <p class="flag-modal__form-description"><%= t("decidim.shared.flag_user_modal.already_reported") %></p>

data/app/cells/decidim/report_user_button/flag_modal.erb

@@ -2,7 +2,7 @@
   <%= form_for report_form, builder:, url: report_path, method: :post, html: { id: nil } do |f| %>
     <div data-dialog-container>
       <%= icon "flag-line" %>
-      <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
+      <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
       <div>
         <div class="form__wrapper flag-modal__form">
           <p class="flag-modal__form-description"><%= t("decidim.shared.flag_user_modal.description") %></p>

data/app/cells/decidim/statistic/show.erb

@@ -1,8 +1,8 @@
 <div class="statistic <%= stat_dom_class %>" data-statistic>
-  <span class="statistic__title" title="<%= stat_title %>">
+  <p class="statistic__title" title="<%= stat_title %>">
     <%= stat_title %>
-  </span>
-  <span class="statistic__number">
+  </p>
+  <p class="statistic__number">
     <%= stat_number %>
-  </span>
+  </p>
 </div>

data/app/cells/decidim/upload_modal/files.erb

@@ -1,9 +1,9 @@
 <div class="upload-modal__files-container upload-container-for-<%= attribute %> <%= with_title %>">
   <div>
-    <%= label %>
+    <%= options[:paragraph] == true ? paragraph : label %>
 
     <% if options[:help_text].present? %>
-      <span class="help-text"><%= options[:help_text] %></span>
+      <p class="help-text"><%= options[:help_text] %></p>
     <% end %>
 
     <%# NOTE: this block is about wrapping a default image for the avatar with the new styles,
@@ -22,24 +22,32 @@
     <div class="upload-modal__files" data-active-uploads="<%= modal_id %>">
       <% attachments.each do |attachment| %>
         <% next if [Array, Hash].any? { |klass| attachment.is_a? klass } %>
+        <% is_persisted_attachment = attachment.is_a?(Decidim::Attachment) && attachment.persisted? %>
+        <% attachment_blob = blob(attachment) %>
 
-        <div class="attachment-details" data-attachment-id="<%= attachment.id %>" data-title="<%= title_for(attachment) %>" data-filename="<%= file_name_for(attachment) %>" data-state="uploaded">
-          <% if file_attachment_path(attachment) && blob(attachment).image? %>
+        <div class="attachment-details"<% if is_persisted_attachment %> data-attachment-id="<%= attachment.id %>"<% end %> data-title="<%= title_for(attachment) %>" data-filename="<%= file_name_for(attachment) %>" data-state="uploaded" data-hidden-field="<%= attachment_blob&.signed_id %>">
+          <% if file_attachment_path(attachment) && attachment_blob&.image? %>
             <div><%= image_tag(file_attachment_path(attachment), alt: "") %></div>
           <% elsif uploader_default_image_path(attribute).present? %>
             <div><%= image_tag uploader_default_image_path(attribute) %></div>
           <% end %>
 
           <% if has_title? %>
-            <span><%= title_for(attachment) %></span>
-            <%= form.hidden_field attribute, multiple: true, value: attachment.id, id: attachment.id %>
+            <p><%= title_for(attachment) %></p>
           <% else %>
-            <% if blob(attachment).image? %>
-              <span><%= title_for(attachment) %></span>
+            <% if attachment_blob&.image? %>
+              <p><%= title_for(attachment) %></p>
             <% else %>
               <%= link_to title_for(attachment), file_attachment_path(attachment), class: "w-full break-all mb-2" %>
             <% end %>
           <% end %>
+          <% if attachment_blob.present? %>
+            <% if is_persisted_attachment %>
+              <%= form.hidden_field attribute, value: attachment.id, id: "hidden_#{attribute}_#{attachment.id}" %>
+            <% else %>
+              <%= form.hidden_field attribute, value: attachment_blob.signed_id, id: "hidden_#{attribute}_#{attachment_blob.id}" %>
+            <% end %>
+          <% end %>
         </div>
       <% end %>
     </div>

data/app/cells/decidim/upload_modal_cell.rb

@@ -30,6 +30,10 @@ module Decidim
       form.send(:custom_label, attribute, options[:label], { required: required?, for: nil })
     end
 
+    def paragraph
+      form.send(:custom_paragraph, attribute, options[:label], { required: required? })
+    end
+
     def button_label
       return button_edit_label if attachments.count.positive?
 
@@ -71,13 +75,16 @@ module Decidim
     end
 
     # By default FoundationRailsHelper adds form errors next to input, but since input is in the modal
-    # and modal is hidden by default, we need to add an additional validation field to the form.
+    # and modal is hidden by default, we add a hidden checkbox field to handle HTML5 validation.
     # This should only be necessary when file is required by the form.
+    # Note: Validation errors are now displayed in the main form area, not inside the modal.
     def input_validation_field
       object_name = form.object.present? ? "#{form.object.model_name.param_key}[#{add_attribute}_validation]" : "#{add_attribute}_validation"
-      input = check_box_tag object_name, 1, attachments.present?, class: "reset-defaults", hidden: true, label: false, required: required?
-      message = form.send(:abide_error_element, add_attribute) + form.send(:error_and_help_text, add_attribute)
-      input + message
+      check_box_tag object_name, 1, attachments.present?, class: "reset-defaults", hidden: true, label: false, required: required?, id: validation_field_id
+    end
+
+    def validation_field_id
+      "#{attribute}_validation"
     end
 
     def explanation
@@ -121,7 +128,16 @@ module Decidim
       @attachments = begin
         attachments = options[:attachments] || form.object.send(attribute)
         attachments = Array(attachments).compact_blank
-        attachments.map { |attachment| attachment.is_a?(String) ? ActiveStorage::Blob.find_signed(attachment) : attachment }
+        attachments.map do |attachment|
+          case attachment
+          when String
+            ActiveStorage::Blob.find_signed(attachment)
+          when Integer
+            Decidim::Attachment.find_by(id: attachment)
+          else
+            attachment
+          end
+        end.compact
       end
     end
 

data/app/commands/decidim/multiple_attachments_methods.rb

@@ -41,8 +41,9 @@ module Decidim
 
     def create_attachments(first_weight: 0)
       weight = first_weight
-      # Add the weights first to the old document
-      @form.documents.each do |document|
+      # Add the weights first to the old documents
+      document_ids = keep_ids
+      Decidim::Attachment.where(id: document_ids).each do |document|
         document.update!(weight:)
         weight += 1
       end
@@ -59,7 +60,7 @@ module Decidim
       documents = include_all_attachments ? documents_attached_to.attachments.with_attached_file : documents_attached_to.documents
 
       documents.each do |document|
-        document.destroy! if @form.documents.map(&:id).exclude? document.id
+        document.destroy! unless keep_ids.include?(document.id)
       end
 
       documents_attached_to.reload
@@ -98,5 +99,21 @@ module Decidim
     def blob(signed_id)
       ActiveStorage::Blob.find_signed(signed_id)
     end
+
+    def keep_ids
+      documents_array = Array(@form.documents)
+      documents_array.map do |doc|
+        case doc
+        when Decidim::Attachment
+          doc.id
+        when Integer
+          doc
+        when String
+          doc.match?(/\A\d+\z/) ? doc.to_i : nil
+        when Hash
+          (doc[:id] || doc["id"]).to_i
+        end
+      end.compact
+    end
   end
 end

data/app/controllers/concerns/decidim/direct_upload.rb

@@ -9,8 +9,6 @@ module Decidim
       skip_before_action :verify_organization
 
       before_action :check_organization!,
-                    :check_authenticated!,
-                    :check_user_belongs_to_organization,
                     :validate_direct_upload
     end
 
@@ -42,16 +40,6 @@ module Decidim
       head :unauthorized if current_organization.blank? && current_admin.blank?
     end
 
-    def check_authenticated!
-      head :unauthorized if current_user.blank? && current_admin.blank?
-    end
-
-    def check_user_belongs_to_organization
-      return if current_admin.present?
-
-      head :unauthorized unless current_organization == current_user.organization
-    end
-
     def allowed_extensions
       if user_has_elevated_role?
         current_organization.settings.upload_allowed_file_extensions_admin
@@ -71,6 +59,8 @@ module Decidim
     private
 
     def user_has_elevated_role?
+      return false if current_user.blank? || current_organization.blank? || current_user.organization != current_organization
+
       [
         current_user&.admin?,
         defined?(Decidim::Assemblies::AssembliesWithUserRole) && Decidim::Assemblies::AssembliesWithUserRole.for(current_user).any?,

data/app/controllers/decidim/devise/sessions_controller.rb

@@ -9,6 +9,8 @@ module Decidim
 
       before_action :check_sign_in_enabled, only: :create
 
+      rescue_from ActionController::InvalidAuthenticityToken, with: :redirect_to_referer_or_path
+
       def create
         super do |user|
           if user.admin?
@@ -44,6 +46,11 @@ module Decidim
 
       private
 
+      def redirect_to_referer_or_path
+        set_flash_message(:alert, "csrf_token", scope: "devise.failure")
+        redirect_back(fallback_location: root_path) && return
+      end
+
       def check_sign_in_enabled
         redirect_to new_user_session_path unless current_organization.sign_in_enabled?
       end

data/app/helpers/concerns/decidim/flash_helper_extensions.rb

@@ -117,9 +117,9 @@ module Decidim
       end
 
       def message(value)
-        return content_tag(:div, value, class: "flash__message") unless value.is_a?(Hash)
+        return content_tag(:p, value, class: "flash__message") unless value.is_a?(Hash)
 
-        content_tag(:div, class: "flash__message") do
+        content_tag(:p, class: "flash__message") do
           concat value[:title]
           concat content_tag(:span, value[:body], class: "flash__message-body")
         end

data/app/jobs/decidim/export_participatory_space_job.rb

@@ -11,7 +11,7 @@ module Decidim
         manifest.name == name.to_sym
       end
 
-      collection = export_manifest.collection.call(participatory_space)
+      collection = export_manifest.collection.call(participatory_space, user)
       serializer = export_manifest.serializer
 
       export_data = Decidim::Exporters.find_exporter(format).new(collection, serializer).export

data/app/jobs/decidim/find_and_update_descendants_job.rb

@@ -4,8 +4,14 @@ module Decidim
   # Update search indexes for each descendants of a given element
   class FindAndUpdateDescendantsJob < ApplicationJob
     queue_as :default
+    MAX_DEPTH = 5
+
+    def perform(element, current_depth = 0)
+      if current_depth >= MAX_DEPTH
+        Rails.logger.warn "Max depth of #{MAX_DEPTH} reached for element #{element.class.name} with id #{element.id}. Stopping recursion."
+        return
+      end
 
-    def perform(element)
       descendants_collector = components_for(element)
       descendants_collector << element.comments.to_a if element.respond_to?(:comments)
 
@@ -14,7 +20,7 @@ module Decidim
       descendants_collector.each do |descendants|
         next if descendants.blank?
 
-        Decidim::UpdateSearchIndexesJob.perform_later(descendants)
+        Decidim::UpdateSearchIndexesJob.perform_later(descendants, current_depth + 1)
       end
     end
 

data/app/jobs/decidim/update_search_indexes_job.rb

@@ -4,8 +4,8 @@ module Decidim
   class UpdateSearchIndexesJob < ApplicationJob
     queue_as :default
 
-    def perform(elements)
-      elements.each { |element| element.try(:try_update_index_for_search_resource) }
+    def perform(elements, current_depth = 0)
+      elements.each { |element| element.try(:try_update_index_for_search_resource, current_depth) }
     end
   end
 end

data/app/models/decidim/attachment.rb

@@ -9,7 +9,7 @@ module Decidim
     include Traceable
 
     before_save :set_content_type_and_size, if: :attached?
-    before_validation :set_link_content_type_and_size, if: :link?
+    before_validation :set_link_content_type_and_size, if: :editable_link?
 
     translatable_fields :title, :description
     belongs_to :attachment_collection, class_name: "Decidim::AttachmentCollection", optional: true
@@ -69,6 +69,20 @@ module Decidim
       link.present?
     end
 
+    # Whether this attachment is a link that can be edited or not.
+    #
+    # Returns Boolean.
+    def editable_link?
+      !destroyed? && !frozen? && link?
+    end
+
+    # Whether this attachment has a file or not.
+    #
+    # Returns Boolean.
+    def file?
+      file.attached?
+    end
+
     # Which kind of file this is.
     #
     # Returns String.
@@ -123,5 +137,12 @@ module Decidim
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::AttachmentPresenter
     end
+
+    def can_participate?(user)
+      return true unless attached_to
+      return true unless attached_to.respond_to?(:can_participate?)
+
+      attached_to.can_participate?(user)
+    end
   end
 end

data/app/packs/src/decidim/a11y.js

@@ -124,6 +124,13 @@ const createDropdown = (component) => {
  * @return {void}
  */
 const createDialog = (component) => {
+  const getFocusableElements = (container) => {
+    const selectors = "a[href],button:not([disabled]),input:not([disabled]),select:not([disabled]),textarea:not([disabled]),[tabindex]:not([tabindex='-1'])";
+    return Array.from(container.querySelectorAll(selectors)).filter(
+      (el) => el.offsetParent !== null
+    );
+  };
+
   const {
     dataset: { dialog, ...attrs }
   } = component;
@@ -145,11 +152,33 @@ const createDialog = (component) => {
     backdropSelector: `[data-dialog="${dialog}"]`,
     enableAutoFocus: false,
     onOpen: (params, trigger) => {
+      const keyHandler = (event) => {
+        if (event.key !== "Tab") {
+          return;
+        }
+        const focusable = getFocusableElements(params);
+        if (focusable.length === 0) {
+          return;
+        }
+        if (event.shiftKey && document.activeElement === focusable[0]) {
+          event.preventDefault();
+          focusable[focusable.length - 1].focus({ preventScroll: true });
+        } else if (!event.shiftKey && document.activeElement === focusable[focusable.length - 1]) {
+          event.preventDefault();
+          focusable[0].focus({ preventScroll: true });
+        }
+      };
+      params._focusTrapHandler = keyHandler;
+      params.addEventListener("keydown", keyHandler);
       setFocusOnTitle(params);
       window.focusGuard.trap(params, trigger);
       params.dispatchEvent(new CustomEvent("open.dialog"));
     },
     onClose: (params) => {
+      if (params._focusTrapHandler) {
+        params.removeEventListener("keydown", params._focusTrapHandler);
+        Reflect.deleteProperty(params, "_focusTrapHandler");
+      }
       window.focusGuard.disable();
       params.dispatchEvent(new CustomEvent("close.dialog"));
     },

data/app/packs/src/decidim/a11y.test.js

@@ -0,0 +1,81 @@
+/* global jest */
+
+import { createDialog } from "src/decidim/a11y"
+
+describe("a11y dialog focus trap", () => {
+  const dialogHtml = `
+    <button id="open-btn" data-dialog-open="testDialog">Open</button>
+    <div id="test-dialog" data-dialog="testDialog">
+      <div data-dialog-container>
+        <h2 id="dialog-title-testDialog" tabindex="-1" data-dialog-title>Test Dialog</h2>
+        <a href="#">Link 1</a>
+        <button>Button 1</button>
+        <input type="text" />
+        <button>Button 2</button>
+        <a href="#">Link 2</a>
+      </div>
+      <div data-dialog-actions>
+        <button data-dialog-close="testDialog">Close</button>
+      </div>
+    </div>
+  `;
+
+  beforeEach(() => {
+    document.body.innerHTML = dialogHtml;
+    window.Decidim = {
+      currentDialogs: {}
+    };
+    window.focusGuard = {
+      trap: jest.fn(),
+      disable: jest.fn()
+    };
+  });
+
+  describe("keydown handler", () => {
+    let dialogEl = null;
+
+    beforeEach(() => {
+      const component = document.querySelector("[data-dialog]");
+      createDialog(component);
+      dialogEl = document.querySelector("[data-dialog='testDialog']");
+      // Get the dialog from Decidim.currentDialogs and open it
+      const dialog = window.Decidim.currentDialogs.testDialog;
+      dialog.open();
+    });
+
+    it("adds keydown handler on open", () => {
+      expect(dialogEl._focusTrapHandler).toBeDefined();
+    });
+
+    it("handles Tab key", () => {
+      const selectors = "a[href],button:not([disabled]),input:not([disabled]),select:not([disabled]),textarea:not([disabled]),[tabindex]:not([tabindex='-1'])";
+      const tabbableElements = Array.from(dialogEl.querySelectorAll(selectors)).filter(
+        (el) => el.offsetParent || el.offsetParent === null
+      );
+      tabbableElements[tabbableElements.length - 1].focus();
+
+      const event = new KeyboardEvent("keydown", { key: "Tab", bubbles: true });
+      const preventDefault = jest.fn();
+      event.preventDefault = preventDefault;
+
+      dialogEl.dispatchEvent(event);
+
+      expect(preventDefault).toHaveBeenCalled();
+    });
+  });
+
+  describe("onClose cleanup", () => {
+    it("removes the keydown handler on close", () => {
+      const component = document.querySelector("[data-dialog]");
+      createDialog(component);
+      const dialogEl = document.querySelector("[data-dialog='testDialog']");
+
+      const dialog = window.Decidim.currentDialogs.testDialog;
+      dialog.open();
+      expect(dialogEl._focusTrapHandler).toBeDefined();
+
+      dialog.close();
+      expect(dialogEl._focusTrapHandler).toBeUndefined();
+    });
+  });
+});

data/app/packs/src/decidim/confirm.js

@@ -162,7 +162,9 @@ export const initializeConfirm = () => {
     return handleDocumentEvent(ev, [
       Rails.linkClickSelector,
       Rails.buttonClickSelector,
-      Rails.formInputClickSelector
+      Rails.formInputClickSelector,
+      'button[data-confirm][type="button"]',
+      "form button[data-confirm]"
     ]);
   });
   document.addEventListener("change", (ev) => {
@@ -180,6 +182,11 @@ export const initializeConfirm = () => {
     $(Rails.formInputClickSelector).on("click.confirm", (ev) => {
       handleConfirm(ev, getMatchingEventTarget(ev, Rails.formInputClickSelector));
     });
+
+    // Handle button[type="button"] with data-confirm inside forms
+    $('button[data-confirm][type="button"]').on("click.confirm", (ev) => {
+      handleConfirm(ev, ev.currentTarget);
+    });
   });
 };