From b11ac53e297e8342165b50a123045d4238b4e503 Mon Sep 17 00:00:00 2001
From: Vincent LAURENT <vince.laurent@gmail.com>
Date: Sun, 14 Nov 2021 01:56:07 +0100
Subject: [PATCH] =?UTF-8?q?Mise=20en=20forme=20svg=20=C3=A0=20ajout=C3=A9?=
 =?UTF-8?q?=20en=20mode=20mobile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/app.js       | 22 ++++++++++++++++++++--
 templates/pdf.html.php |  8 +++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/public/js/app.js b/public/js/app.js
index 8078358..ee64c95 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -133,7 +133,11 @@ loadingTask.promise.then(function(pdf) {
             document.getElementById('btn_svn_select').classList.add('d-none');
             document.getElementById('svg_object_actions').classList.add('d-none');
             document.getElementById('svg_selected_container').classList.remove('d-none');
-            document.getElementById('svg_selected').src = input.value;
+            if(input.value.match(/^data:/)) {
+                document.getElementById('svg_selected').src = input.value;
+            } else {
+                document.getElementById('svg_selected').src = input.dataset.svg;
+            }
         } else {
             document.getElementById('btn_svn_select').classList.remove('d-none');
             document.getElementById('svg_object_actions').classList.add('d-none');
@@ -501,6 +505,15 @@ loadingTask.promise.then(function(pdf) {
         deleteActiveObject();
     });
 
+    document.getElementById('btn_svg_selected_close').addEventListener('click', function(event) {
+        var input_selected = document.querySelector('input[name="svg_2_add"]:checked');
+
+        stateAddLock(false);
+        input_selected.checked = false;
+        input_selected.dispatchEvent(new Event("change"));
+        this.blur();
+    });
+
     document.addEventListener('click', function(event) {
         if(event.target.nodeName == "DIV") {
 
@@ -585,6 +598,7 @@ loadingTask.promise.then(function(pdf) {
                 return;
             }
             document.getElementById('svg_object_actions').classList.remove('d-none');
+            document.getElementById('svg_selected_container').classList.add('d-none');
             document.getElementById('btn_svn_select').classList.add('d-none');
         });
 
@@ -592,7 +606,11 @@ loadingTask.promise.then(function(pdf) {
             if(!is_mobile()) {
                 return;
             }
-            document.getElementById('btn_svn_select').classList.remove('d-none');
+            if(document.querySelector('input[name="svg_2_add"]:checked')) {
+                document.getElementById('svg_selected_container').classList.remove('d-none');
+            } else {
+                document.getElementById('btn_svn_select').classList.remove('d-none');
+            }
             document.getElementById('svg_object_actions').classList.add('d-none');
         });
 
diff --git a/templates/pdf.html.php b/templates/pdf.html.php
index e3f407c..530b098 100644
--- a/templates/pdf.html.php
+++ b/templates/pdf.html.php
@@ -81,11 +81,9 @@
             <div class="d-grid gap-2">
             <button id="btn_svn_select" class="btn btn-light btn-lg" data-bs-toggle="offcanvas" data-bs-target="#offcanvasTop" aria-controls="offcanvasTop"><i class="bi bi-hand-index"></i> Séléctionner une signature</button>
             </div>
-            <div id="svg_selected_container" class="d-grid gap-2 d-none">
-                <div class="btn-group">
-                    <button class="btn btn-outline-secondary"><img id="svg_selected" src="" style="max-height: 40px;" class="img-fluid"/></button>
-                    <button class="btn btn-link" data-bs-toggle="offcanvas" data-bs-target="#offcanvasTop" aria-controls="offcanvasTop"> Changer</button>
-                </div>
+            <div id="svg_selected_container" class="text-center d-none position-relative">
+                <img id="svg_selected" src="" style="max-height: 40px;" class="img-fluid"/>
+                <button type="button" id="btn_svg_selected_close" class="btn-close text-reset position-absolute top-0 end-0"></button>
             </div>
             <div id="svg_object_actions" class="d-none">
                 <button id="btn-svg-pdf-delete" class="btn btn-lg btn-light"><i class="bi bi-trash"></i></button>