Browse Source

Renommage modal en popup

Arthur Brandao 5 năm trước cách đây
mục cha
commit
e17bb7f145
2 tập tin đã thay đổi với 31 bổ sung28 xóa
  1. 1 1
      WebContent/js/script.js
  2. 30 27
      WebContent/scan/index.html

+ 1 - 1
WebContent/js/script.js

@@ -80,7 +80,7 @@ $(document).ready(function(){
     // Select
     $('select').formSelect();
     // Modal
-    M.Modal.init($('.modal'), {
+    M.Modal.init($('.popup'), {
         dismissible: false,
         startingTop: '20%',
         endingTop: '25%',

+ 30 - 27
WebContent/scan/index.html

@@ -48,8 +48,8 @@
         </div>
     </main>
 
-    <!-- Modals -->
-    <div id="ok-modal" class="modal">
+    <!-- Popup -->
+    <div id="ok-popup" class="modal popup">
         <div class="modal-content" style="overflow: hidden;">
             <div class="row">
                 <div class="col offset-m1 m3 s12">
@@ -61,9 +61,7 @@
             </div>    
         </div>
     </div>
-
-    <!-- Modals -->
-    <div id="err-modal" class="modal">
+    <div id="err-popup" class="modal popup">
         <div class="modal-content" style="overflow: hidden;">
             <div class="row">
                 <div class="col offset-m1 m3 s12">
@@ -83,29 +81,34 @@
     <!-- Script pour cette page-->
     <script type="text/javascript" src="../js/instascan.min.js"></script>
     <script type="text/javascript">
-        // Lecteur cookie espace
-        const espace = getCookie("microfolies.lens.espace");
-        // Changement nom titre
-        if (espace !== undefined) {
-            $('#title').html(espace.capitalize());
-        }
-        //Scanner QRcode
-        const scanner = new Instascan.Scanner({ video: document.getElementById('qr-preview') });
-        scanner.addListener('scan', function (content) {
-            const result = espace ? content + "/" + espace : content;
-            $('#result').html(result);
-            M.Modal.getInstance($('#ok-modal')).open();
-        });
-        Instascan.Camera.getCameras().then(function (cameras) {
-            if (cameras.length > 0) {
-                scanner.start(cameras[0]);
-            }
-            else {
-                console.error('No cameras found.');
+    	$(document).ready(() => {
+    		const okPopup = M.Modal.getInstance($('#ok-popup'));
+    		const errPopup = M.Modal.getInstance($('#err-popup'))
+    		
+    		// Lecteur cookie espace
+            const espace = getCookie("microfolies.lens.espace");
+            // Changement nom titre
+            if (espace !== undefined) {
+                $('#title').html(espace.capitalize());
             }
-        }).catch(err => {
-            console.error(err);
-        });
+            //Scanner QRcode
+            const scanner = new Instascan.Scanner({ video: document.getElementById('qr-preview') });
+            scanner.addListener('scan', function (content) {
+                const result = espace ? content + "/" + espace : content;
+                $('#result').html(result);
+                okPopup.open();
+            });
+            Instascan.Camera.getCameras().then(function (cameras) {
+                if (cameras.length > 0) {
+                    scanner.start(cameras[0]);
+                }
+                else {
+                    console.error('No cameras found.');
+                }
+            }).catch(err => {
+                console.error(err);
+            });	
+    	});
     </script>
 </body>