From 7e17ef786cb9870eccdf208facbd4ba142777532 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Tue, 15 Dec 2020 11:48:44 +0100
Subject: [PATCH] custom amount focusses input when clicked
---
resources/js/bitpay.js | 24 -------------------
resources/js/donation.js | 7 ++++++
resources/views/layouts/staticPages.blade.php | 5 ++++
routes/web.php | 1 +
webpack.mix.js | 2 +-
5 files changed, 14 insertions(+), 25 deletions(-)
delete mode 100644 resources/js/bitpay.js
create mode 100644 resources/js/donation.js
diff --git a/resources/js/bitpay.js b/resources/js/bitpay.js
deleted file mode 100644
index 40a550e83..000000000
--- a/resources/js/bitpay.js
+++ /dev/null
@@ -1,24 +0,0 @@
-function bitpayCheckRequiredFields(form) {
- var elements = form.elements;
- var invalid = false;
- for (var i = 0; i < elements.length; i++) {
- elements[i].className = elements[i].className.replace('bitpay-donate-error', '');
- if (elements[i].className.indexOf("required") !== -1 && elements[i].value.length < 1) {
- elements[i].className = elements[i].className + ' bitpay-donate-error';
- invalid = true;
- };
- }
- if (invalid) {
- return false;
- }
- var donationElement = document.getElementById('donation-value');
- if (donationElement) {
- var enteredDonation = Number(donationElement.value);
- var maximumDonation = Number(document.getElementById('reference-maximum').value);
- if (enteredDonation > maximumDonation) {
- alert("Your donation was larger than the allowed maximum of " + Number(maximumDonation).toFixed(2))
- return false;
- };
- };
- return true;
-};
\ No newline at end of file
diff --git a/resources/js/donation.js b/resources/js/donation.js
new file mode 100644
index 000000000..f6ad022a5
--- /dev/null
+++ b/resources/js/donation.js
@@ -0,0 +1,7 @@
+$(document).ready(function () {
+ $(".amount-custom").click(function () {
+ setTimeout(function () {
+ $("#custom-amount").focus();
+ }, 100)
+ });
+});
\ No newline at end of file
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 04059176c..b4c9520be 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -62,6 +62,11 @@
<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
<script src="{{ mix('js/lib.js') }}"></script>
<script src="{{ mix('js/utility.js') }}"></script>
+ @if(!empty($js) && is_array($js))
+ @foreach($js as $jsFile)
+ <script src="{{$jsFile}}" async></script>
+ @endforeach
+ @endif
</head>
<body>
@if(Request::getHttpHost() === "metager3.de")
diff --git a/routes/web.php b/routes/web.php
index da5dae281..aa421dad3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -73,6 +73,7 @@ Route::group(
Route::get('spende', function () {
return view('spende.spende')
->with('title', trans('titles.spende'))
+ ->with('js', [mix('/js/donation.js')])
->with('navbarFocus', 'foerdern');
});
Route::get('spende/danke/{data}', ['as' => 'danke', function ($data) {
diff --git a/webpack.mix.js b/webpack.mix.js
index 9d6a8b62e..5103ed583 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -78,7 +78,7 @@ mix
"public/js/scriptResultPage.js"
)
.babel("resources/js/editLanguage.js", "public/js/editLanguage.js")
- .babel("resources/js/bitpay.js", "public/js/bitpay.js")
+ .babel("resources/js/donation.js", "public/js/donation.js")
// utility
.babel(
["resources/js/utility.js", "resources/js/translations.js"],
--
GitLab