From ca82f62ea200c5ea126267dbb8a524d85a243fcc Mon Sep 17 00:00:00 2001 From: wandji20 Date: Wed, 30 Oct 2024 22:33:49 +0100 Subject: [PATCH] Remove unused email logic in login_modal controller and clean up UI --- app/views/layouts/_forgot_tab.html.haml | 2 +- app/views/layouts/_login_tab.html.haml | 2 +- app/views/layouts/_signup_tab.html.haml | 2 +- app/webpacker/controllers/login_modal_controller.js | 10 +--------- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/views/layouts/_forgot_tab.html.haml b/app/views/layouts/_forgot_tab.html.haml index 80a9727b60..c1b8e36e88 100644 --- a/app/views/layouts/_forgot_tab.html.haml +++ b/app/views/layouts/_forgot_tab.html.haml @@ -6,7 +6,7 @@ .row .large-12.columns = form.label :email, t(:signup_email) - = form.email_field :email, { tabindex: 1, inputmode: "email", "data-login-modal-target": "email", "data-action": "input->login-modal#emailOnInput" } + = form.email_field :email, { tabindex: 1, inputmode: "email" } .row .large-12.columns = form.submit t(:reset_password), { class: "button primary", tabindex: 2 } diff --git a/app/views/layouts/_login_tab.html.haml b/app/views/layouts/_login_tab.html.haml index 9e965a8270..a1a21f2647 100644 --- a/app/views/layouts/_login_tab.html.haml +++ b/app/views/layouts/_login_tab.html.haml @@ -10,7 +10,7 @@ .row .large-12.columns = form.label :email, t(:email) - = form.email_field :email, { tabindex: 1, inputmode: "email", autocomplete: "off", "data-login-modal-target": "email", "data-action": "input->login-modal#emailOnInput" } + = form.email_field :email, { tabindex: 1, inputmode: "email", autocomplete: "off" } .row .large-12.columns = form.label :password, t(:password) diff --git a/app/views/layouts/_signup_tab.html.haml b/app/views/layouts/_signup_tab.html.haml index b126a24187..929e56c58f 100644 --- a/app/views/layouts/_signup_tab.html.haml +++ b/app/views/layouts/_signup_tab.html.haml @@ -8,7 +8,7 @@ .row .large-12.columns = form.label :email, t(:signup_email) - = form.email_field :email, { tabindex: 1, "data-login-modal-target": "email", "data-action": "input->login-modal#emailOnInput" } + = form.email_field :email, { tabindex: 1 } = form.error_message_on :email .row .large-12.columns diff --git a/app/webpacker/controllers/login_modal_controller.js b/app/webpacker/controllers/login_modal_controller.js index 82ac3c7e2a..535b5b102f 100644 --- a/app/webpacker/controllers/login_modal_controller.js +++ b/app/webpacker/controllers/login_modal_controller.js @@ -1,8 +1,7 @@ import { Controller } from "stimulus"; export default class extends Controller { - static targets = ["background", "modal", "email"]; - static values = { email: String }; + static targets = ["background", "modal"]; connect() { if (this.hasModalTarget) { @@ -19,13 +18,6 @@ export default class extends Controller { window.dispatchEvent(new Event("login:modal:open")); } - emailOnInput(event) { - this.emailValue = event.currentTarget.value; - this.emailTargets.forEach((element) => { - element.value = this.emailValue; - }); - } - open = () => { if (!location.hash.substr(1).includes("/login")) { history.pushState({}, "", "#/login");