From 68e0dfe38d582f7f8bf78b22b4aaf2441bb2d304 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Tue, 1 Jun 2021 11:05:38 +0200
Subject: [PATCH 12/12] to fixup: simplify popup window opening

---
 .../templates/franceconnect_data/demo.html    | 35 ++++++-------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/passerelle/apps/franceconnect_data/templates/franceconnect_data/demo.html b/passerelle/apps/franceconnect_data/templates/franceconnect_data/demo.html
index b8b231c6..cd8ca479 100644
--- a/passerelle/apps/franceconnect_data/templates/franceconnect_data/demo.html
+++ b/passerelle/apps/franceconnect_data/templates/franceconnect_data/demo.html
@@ -20,30 +20,14 @@
   <input type="checkbox" id="dgfip"/>
 </p>
         <script>
+            function popupwindow(url, title, w, h) {
+                var left = (screen.width/2)-(w/2);
+                var top = (screen.height/2)-(h/2);
+                return window.open(
+                    url, title,
+                    'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=no, copyhistory=no, width='+w+', height='+h+', top='+top+', left='+left);
+            }
             var popup = null;
-const popupCenter = function(url, title, w, h) {
-    // Fixes dual-screen position                             Most browsers      Firefox
-    const dualScreenLeft = window.screenLeft !==  undefined ? window.screenLeft : window.screenX;
-    const dualScreenTop = window.screenTop !==  undefined   ? window.screenTop  : window.screenY;
-
-    const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width;
-    const height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height;
-
-    const systemZoom = width / window.screen.availWidth;
-    const left = (width - w) / 2 / systemZoom + dualScreenLeft
-    const top = (height - h) / 2 / systemZoom + dualScreenTop
-    popup = window.open(url, title,
-      `
-      scrollbars=yes,
-      width=${w / systemZoom},
-      height=${h / systemZoom},
-      top=${top},
-      left=${left}
-      `
-    )
-
-    if (window.focus) popup.focus();
-};
 
             $('#start').on('click', function () {
                 $('#user-info').hide();
@@ -53,7 +37,10 @@ const popupCenter = function(url, title, w, h) {
                 if (checkbox && checkbox.checked) {
                     url += '&mode=dgfip';
                 };
-                popupCenter(url, 'FranceConnect', 1000, 670);
+                popup = popupwindow(url, 'FranceConnect', 1000, 670);
+                if (window.focus) {
+                    popup.focus();
+                }
             });
             $(window).on('message', function(event) {
                 var data = event.originalEvent.data;
-- 
2.32.0.rc0