From 8ff0988b4925d79bc484bdbaa3d0c11b3fae41aa Mon Sep 17 00:00:00 2001
From: Malte Hellmeier <git@mhellmeier.de>
Date: Sun, 19 Sep 2021 21:34:44 +0200
Subject: [PATCH 1/4] Add close button to QR-Code modal

---
 src/js/core.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/js/core.js b/src/js/core.js
index cf245abe9..9a6e8d23c 100644
--- a/src/js/core.js
+++ b/src/js/core.js
@@ -692,15 +692,16 @@ const photoBooth = (function () {
         // Add QR Code Image
         const qrCodeModal = $('#qrCode');
         photoboothTools.modal.empty(qrCodeModal);
+        const body = qrCodeModal.find('.modal__body');
+        $('<button>').on('click touchstart', function(e) {
+            photoboothTools.modal.close('#qrCode');
+        }).append($('<i>').addClass('fa fa-times')).css('float', 'right').appendTo(body);
         $('<img src="api/qrcode.php?filename=' + filename + '"/>').on('load', function () {
-            const body = qrCodeModal.find('.modal__body');
-
-            $(this).appendTo(body);
             $('<p>')
                 .css('max-width', this.width + 'px')
                 .html(photoboothTools.getTranslation('qrHelp') + '</br><b>' + config.webserver.ssid + '</b>')
                 .appendTo(body);
-        });
+        }).appendTo(body);
 
         // Add Print Link
         $(document).off('click touchstart', '.printbtn');

From a08e1b05f0effd11ea93c4aa4fca22003f4eea2a Mon Sep 17 00:00:00 2001
From: Malte Hellmeier <git@mhellmeier.de>
Date: Sun, 19 Sep 2021 21:43:45 +0200
Subject: [PATCH 2/4] Add close button to QR-Code modal in gallery view

---
 src/js/photoinit.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/js/photoinit.js b/src/js/photoinit.js
index b7d912aa6..9c8be19fc 100644
--- a/src/js/photoinit.js
+++ b/src/js/photoinit.js
@@ -251,6 +251,11 @@ function initPhotoSwipeFromDOM(gallerySelector) {
             let img = gallery.currItem.src;
             img = img.split('\\').pop().split('/').pop();
 
+            $('<button>').on('click touchstart', function(e) {
+                e.preventDefault();
+                e.stopPropagation();
+                $('.pswp__qr').empty().removeClass('qr-active').fadeOut('fast');
+            }).append($('<i>').addClass('fa fa-times')).css('float', 'right').appendTo(pswpQR);
             $('<img>')
                 .attr('src', 'api/qrcode.php?filename=' + img)
                 .appendTo(pswpQR);

From 4d9c19aed6bab4433d4070c316e5a207e85cb67d Mon Sep 17 00:00:00 2001
From: Malte Hellmeier <git@mhellmeier.de>
Date: Sun, 19 Sep 2021 21:51:27 +0200
Subject: [PATCH 3/4] Update Contributors

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e93ddc76..1b41b1428 100644
--- a/README.md
+++ b/README.md
@@ -165,4 +165,4 @@ If you like my work and like to keep me motivated you can buy me a coconut water
 - [Christian Tarne](https://github.com/Metropo)
 - [DeNeD1](https://github.com/DeNeD1)
 - [DIY89](https://github.com/DIY89)
-
+- [mhellmeier](https://github.com/mhellmeier)

From c8a8a35adf94b83f8e4a5a60c0ab617f4b35884c Mon Sep 17 00:00:00 2001
From: Andreas Blaesius <andi@unlegacy-android.org>
Date: Sun, 26 Sep 2021 09:20:02 +0200
Subject: [PATCH 4/4] fix lint errors

Change-Id: I0d70b9b94845367bbab4c4390882c5368aee18cf
---
 src/js/core.js      | 27 ++++++++++++++++++---------
 src/js/photoinit.js | 14 +++++++++-----
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/js/core.js b/src/js/core.js
index 9a6e8d23c..f4c3f5e86 100644
--- a/src/js/core.js
+++ b/src/js/core.js
@@ -693,15 +693,24 @@ const photoBooth = (function () {
         const qrCodeModal = $('#qrCode');
         photoboothTools.modal.empty(qrCodeModal);
         const body = qrCodeModal.find('.modal__body');
-        $('<button>').on('click touchstart', function(e) {
-            photoboothTools.modal.close('#qrCode');
-        }).append($('<i>').addClass('fa fa-times')).css('float', 'right').appendTo(body);
-        $('<img src="api/qrcode.php?filename=' + filename + '"/>').on('load', function () {
-            $('<p>')
-                .css('max-width', this.width + 'px')
-                .html(photoboothTools.getTranslation('qrHelp') + '</br><b>' + config.webserver.ssid + '</b>')
-                .appendTo(body);
-        }).appendTo(body);
+        $('<button>')
+            .on('click touchstart', function (ev) {
+                ev.preventDefault();
+                ev.stopPropagation();
+
+                photoboothTools.modal.close('#qrCode');
+            })
+            .append($('<i>').addClass('fa fa-times'))
+            .css('float', 'right')
+            .appendTo(body);
+        $('<img src="api/qrcode.php?filename=' + filename + '"/>')
+            .on('load', function () {
+                $('<p>')
+                    .css('max-width', this.width + 'px')
+                    .html(photoboothTools.getTranslation('qrHelp') + '</br><b>' + config.webserver.ssid + '</b>')
+                    .appendTo(body);
+            })
+            .appendTo(body);
 
         // Add Print Link
         $(document).off('click touchstart', '.printbtn');
diff --git a/src/js/photoinit.js b/src/js/photoinit.js
index 9c8be19fc..4c956b589 100644
--- a/src/js/photoinit.js
+++ b/src/js/photoinit.js
@@ -251,11 +251,15 @@ function initPhotoSwipeFromDOM(gallerySelector) {
             let img = gallery.currItem.src;
             img = img.split('\\').pop().split('/').pop();
 
-            $('<button>').on('click touchstart', function(e) {
-                e.preventDefault();
-                e.stopPropagation();
-                $('.pswp__qr').empty().removeClass('qr-active').fadeOut('fast');
-            }).append($('<i>').addClass('fa fa-times')).css('float', 'right').appendTo(pswpQR);
+            $('<button>')
+                .on('click touchstart', function (ev) {
+                    ev.preventDefault();
+                    ev.stopPropagation();
+                    $('.pswp__qr').empty().removeClass('qr-active').fadeOut('fast');
+                })
+                .append($('<i>').addClass('fa fa-times'))
+                .css('float', 'right')
+                .appendTo(pswpQR);
             $('<img>')
                 .attr('src', 'api/qrcode.php?filename=' + img)
                 .appendTo(pswpQR);