From 9b3ad29b8298efdacd7d4fae1488a174e8fd3939 Mon Sep 17 00:00:00 2001 From: bilal Date: Tue, 23 Jun 2020 12:13:28 +0200 Subject: [PATCH] fix MR comments --- app/assets/javascripts/photo_preview.js | 11 +++-------- app/views/public/appearance_releases/new.html.erb | 6 +++--- app/views/public/talent_releases/new.html.erb | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/photo_preview.js b/app/assets/javascripts/photo_preview.js index 34c4543..741db37 100644 --- a/app/assets/javascripts/photo_preview.js +++ b/app/assets/javascripts/photo_preview.js @@ -51,13 +51,8 @@ $(document).on("turbolinks:load", function() { $("[data-behavior=guardian-photo-preview]").each(function(index, element) { App.PhotoPreview.init(element); }); - $("[data-behavior=take-person-photo]").click(function(e) { - $("[data-ujs-target=person-photo-input]").trigger("click"); - }); - $("[data-behavior=take-guardian-photo]").click(function(e) { - $("[data-ujs-target=guardian-photo-input]").trigger("click"); - }); - $("[data-behavior=take-guardian-2-photo]").click(function(e) { - $("[data-ujs-target=guardian-2-photo-input]").trigger("click"); + $("[data-behavior=trigger-click]").click(function(e) { + const target = $(this).data("target"); + $(target).trigger("click"); }); }); diff --git a/app/views/public/appearance_releases/new.html.erb b/app/views/public/appearance_releases/new.html.erb index 2b08f1a..c88d7d6 100644 --- a/app/views/public/appearance_releases/new.html.erb +++ b/app/views/public/appearance_releases/new.html.erb @@ -57,7 +57,7 @@ <%= form.hidden_field :person_photo, value: form.object.person_photo.signed_id if @appearance_release.person_photo.attached? %> <%= form.file_field :person_photo, hide_label: true, data: { ujs_target: "person-photo-input" }, accept: @appearance_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %> - <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "take-person-photo" } %> + <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=person-photo-input]" } %>

<%= fa_icon "arrow-up", text: t(".photo.camera_instructions_html") %>
@@ -100,7 +100,7 @@ <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @appearance_release.guardian_photo.attached? %> <%= form.file_field :guardian_photo, required: @appearance_release.minor?, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @appearance_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %> - <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "take-guardian-photo" } %> + <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-photo-input]" } %>

<%= fa_icon "arrow-up", text: t(".photo.camera_instructions_html") %>
@@ -141,7 +141,7 @@ <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if @appearance_release.guardian_2_photo.attached? %> <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, accept: @appearance_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %> - <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "take-guardian-2-photo" } %> + <%= button_tag t(".photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-2-photo-input]" } %>

<%= fa_icon "arrow-up", text: t(".photo.camera_instructions_html") %>
diff --git a/app/views/public/talent_releases/new.html.erb b/app/views/public/talent_releases/new.html.erb index 17c5239..43483c9 100644 --- a/app/views/public/talent_releases/new.html.erb +++ b/app/views/public/talent_releases/new.html.erb @@ -78,7 +78,7 @@ <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if @talent_release.guardian_photo.attached? %> <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, accept: @talent_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %> - <%= button_tag t(".guardian_photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "take-guardian-photo" } %> + <%= button_tag t(".guardian_photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-photo-input]" } %>

<%= fa_icon "arrow-up", text: t(".guardian_photo.camera_instructions_html") %>