From 336b7abef59e47c6e16c3587a703af558871072a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Wed, 12 Dec 2018 13:05:52 +0100
Subject: [PATCH] bugfix: Click the submit button in the new UI does not work
on chrome.
---
modules/core/templates/loginuserpass.twig | 14 ++++++++------
modules/core/www/assets/js/loginuserpass.js | 21 ++++++---------------
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/modules/core/templates/loginuserpass.twig b/modules/core/templates/loginuserpass.twig
index 17646506d..59529528b 100644
--- a/modules/core/templates/loginuserpass.twig
+++ b/modules/core/templates/loginuserpass.twig
@@ -98,13 +98,15 @@
</div> <!-- form-align-->
<br><br>
- <button class="pure-button pure-button-red pure-input-1-2 pure-input-sm-1-1 right" id="submit_button" type="submit" tabindex="6">
- {{ 'Login'|trans }}
- </button>
- <input type='hidden' id="processing_trans" value="{{ 'Processing...'|trans }}" />
- {% for name, value in stateparams -%}
- <input type="hidden" name="{{ name }}" value="{{ value }}" />
+ {%- for name, value in stateparams %}
+
+ <input type="hidden" name="{{ name }}" value="{{ value }}"/>
{%- endfor %}
+
+ <button class="pure-button pure-button-red pure-input-1-2 pure-input-sm-1-1 right" id="submit_button"
+ type="submit" tabindex="6" data-processing="{% trans %}Processing...{% endtrans %}">
+ {% trans %}Log in{% endtrans %}
+ </button>
</form>
</div><!--center-->
{% if links -%}
diff --git a/modules/core/www/assets/js/loginuserpass.js b/modules/core/www/assets/js/loginuserpass.js
index e475e8ca6..eda960286 100644
--- a/modules/core/www/assets/js/loginuserpass.js
+++ b/modules/core/www/assets/js/loginuserpass.js
@@ -1,15 +1,6 @@
-document.addEventListener(
- 'DOMContentLoaded',
- function () {
- var button = document.getElementById("submit_button");
- button.addEventListener(
- 'click',
- function () {
- var translation = document.getElementById("processing_trans");
- this.disabled = true;
- this.innerHTML = translation.value;
- return true;
- }
- );
- }
-);
+$(document).ready(function () {
+ $('#submit_button').on('click', function () {
+ $(this).attr('disabled', 'disabled');
+ $(this).html($(this).data('processing'));
+ });
+});
--
GitLab