wip #6482 @1:00

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
index 16c4f08dbf10dad085e8dfa58d0621a405a36732..5754cae231f63243b63448c33864cbc6ab10d5df 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
@@ -307,6 +307,8 @@ trait LinksOperation
             cache()->forget('connexion'.$fluidbookId);
         }
         $connexionExist = cache()->get('connexion'.$fluidbookId);
+        //dump($token);
+        //dump($connexionExist);
         if($connexionExist && $fluidbookId === $connexionExist['f_id']) {
             if($userId != $connexionExist['id'] || $token !== $connexionExist['token']) {
                 return json_encode(["status"=>"unavailable","infos_connection"=>array_merge(["user" => $user],$connexionExist)]);

diff --git a/resources/linkeditor/js/linkeditor.js b/resources/linkeditor/js/linkeditor.js
index 792ad897979252b43b4832ff6e94c643e8a88ed5..a2cdab0746d6252f6613d21612b6071b6f62aaab 100644 (file)
--- a/resources/linkeditor/js/linkeditor.js
+++ b/resources/linkeditor/js/linkeditor.js
@@ -591,12 +591,12 @@ $(function () {
 
     let interval = null;
     let userID = $("#userID").data("id");
-    function intervalConnection() {
-        //interval = setInterval(function () {
+    function intervalConnection(data = {}) {
+        interval = setInterval(function () {
             $.ajax({
                 method: "POST",
                 url: '/fluidbook-publication/' + FLUIDBOOK_DATA.id + '/edit/links',
-                data: {id: FLUIDBOOK_DATA.id, token: $("[data-token]").data("token")}
+                data: data.length > 0 ? data : {id: FLUIDBOOK_DATA.id, token: $("[data-token]").data("token")}
             }).done(function (msg) {
                 let response = JSON.parse(msg)
 
@@ -616,7 +616,6 @@ $(function () {
                     }
                 } else {
                     if ($("#popup-overlay").find('.popup[data-popup="unavailable"]').length > 0) {
-
                         $("#popup-overlay").removeClass("show")
                         window.linkeditor.popup.close();
                     }
@@ -631,7 +630,7 @@ $(function () {
                     };
                 }
             });
-        //}, 2000)
+        }, 2000)
     }
     intervalConnection()
 
@@ -646,10 +645,18 @@ $(function () {
         }).done(function (msg) {
             intervalConnection();
         });
-
     })
-});
 
+    //
+    window.onbeforeunload = function (e) {
+        e.preventDefault()
+        e.returnValue = ''
+        let data = {id: FLUIDBOOK_DATA.id, token: $("[data-token]").data("token"), clear: true }
+        if(data.token !== null) {
+            intervalConnection(data);
+        }
+    };
+});
 
 (function (old) {
     $.fn.attr = function () {

diff --git a/resources/views/fluidbook_publication/link_editor.blade.php b/resources/views/fluidbook_publication/link_editor.blade.php
index 8fd954e2b4670a19cb9e7361a802b8f9cce73949..e8ce2b0af4e4efe98544186d6143f11da6c3e717 100644 (file)
--- a/resources/views/fluidbook_publication/link_editor.blade.php
+++ b/resources/views/fluidbook_publication/link_editor.blade.php
@@ -127,9 +127,6 @@
       'height'=>__('Appliquer la même hauteur à la sélection'),
       'both'=>__('Appliquer les mêmes dimensions à la sélection'),
     ];
-
-    $connexionInfo = cache()->get('connexion'.$id);
-    $user = \App\Models\User::find($connexionInfo['id']);
 @endphp
 @extends('layouts.linkeditor')