From 4608e25fdf2ef9a1ecc9d1d21af9ca2f3bd721ff Mon Sep 17 00:00:00 2001
From: tofulm <tofulm@gmail.com>
Date: Thu, 12 Jan 2023 00:32:14 +0100
Subject: [PATCH] =?UTF-8?q?Fix:=20correction=20sur=20le=20rechargement=20d?=
 =?UTF-8?q?u=20gamutable=20=C3=A0=20la=20validation=20des=20crayons=20sur?=
 =?UTF-8?q?=20les=202=20tableaux?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gamutable_pipelines.php      |  6 +++---
 src/components/gamuTable.vue | 11 ++++-------
 src/gamutable.js             | 17 ++++++++---------
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/gamutable_pipelines.php b/gamutable_pipelines.php
index d76a7f2..a2afabb 100644
--- a/gamutable_pipelines.php
+++ b/gamutable_pipelines.php
@@ -52,11 +52,11 @@ function gamutable_crayons_vue_affichage_final($flux){
 	$objet = $flux['args']['type'];
 	if (
 		$id = intval($id)
-		and (!empty($GLOBALS['gamutable_rechargerJson_all']) and !in_array($objet, $GLOBALS['gamutable_rechargerJson_all']))
+		and !in_array($objet, $GLOBALS['gamutable_rechargerJson_all'] ?? [])
 	) {
-		$flux['data'] .= ' <script type="text/javascript">if ( typeof app === "function") {  app.rechargerJson('.$id.');} </script>';
+		$flux['data'] .= ' <script type="text/javascript">if ( typeof app_deux === "object") {  app_deux.rechargerJson('.$id.');}if ( typeof app === "object") {  app.rechargerJson('.$id.');} </script>';
 	} else {
-		$flux['data'] .= ' <script type="text/javascript">if ( typeof app === "function") { app.rechargerJson();} </script>';
+		$flux['data'] .= $objet . ' <script type="text/javascript">if ( typeof app_deux === "object") { app_deux.rechargerJson();}if ( typeof app === "object") { app.rechargerJson();} </script>';
 	}
 
 	return $flux;
diff --git a/src/components/gamuTable.vue b/src/components/gamuTable.vue
index 35c9041..f1c4b79 100644
--- a/src/components/gamuTable.vue
+++ b/src/components/gamuTable.vue
@@ -1090,15 +1090,12 @@ function trouver_index(table, id) {
 	});
 	return i;
 }
-function rechargerJson(id, ajaxCrayons = true) {
-	ajaxCrayons = ajaxCrayons;
+function rechargerJson(id, ajax_Crayons = true) {
+	console.log("rechargerJson");
+	ajaxCrayons = ajax_Crayons;
 	chargerJson(id);
 }
-function rechargerJson_deux(id, ajaxCrayons = true) {
-	ajaxCrayons = ajaxCrayons;
-	chargerJson(id);
-}
-defineExpose({ rechargerJson, rechargerJson_deux });
+defineExpose({ rechargerJson });
 </script>
 
 <style scoped>
diff --git a/src/gamutable.js b/src/gamutable.js
index 4ee8c4f..1a27c41 100644
--- a/src/gamutable.js
+++ b/src/gamutable.js
@@ -1,19 +1,19 @@
 // https://vitejs.dev/config/#build-polyfillmodulepreload
-import "vite/modulepreload-polyfill";
+import 'vite/modulepreload-polyfill';
 
 // Vue
-import { createApp } from "vue";
+import { createApp } from 'vue';
 
 // if importing all is too much you can always do it manually
-import GamuTable from "./components/gamuTable.vue";
-import VuePapaParse from "vue-papa-parse";
+import GamuTable from './components/gamuTable.vue';
+import VuePapaParse from 'vue-papa-parse';
 
 const components = {
 	GamuTable,
 };
 
 let i = 1;
-for (const el of document.getElementsByClassName("vue-gamutable")) {
+for (const el of document.getElementsByClassName('vue-gamutable')) {
 	if (i === 1) {
 		window.app = createApp({
 			components,
@@ -22,18 +22,17 @@ for (const el of document.getElementsByClassName("vue-gamutable")) {
 			},
 		});
 		app.use(VuePapaParse);
-		app.provide("$papa", app.config.globalProperties.$papa);
+		app.provide('$papa', app.config.globalProperties.$papa);
 		app.mount(el);
 	} else if (i === 2) {
 		window.app_deux = createApp({
 			components,
 			mounted() {
-				app_deux.rechargerJson =
-					this.$refs.montableau_deux.rechargerJson;
+				app_deux.rechargerJson = this.$refs.montableau_deux.rechargerJson;
 			},
 		});
 		app_deux.use(VuePapaParse);
-		app_deux.provide("$papa", app_deux.config.globalProperties.$papa);
+		app_deux.provide('$papa', app_deux.config.globalProperties.$papa);
 		app_deux.mount(el);
 	}
 	i++;