From 085855cdc5e36953aa50048d8743d3a4bd25a464 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Fri, 5 Mar 2021 12:40:19 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20fix=20for=20tooltips=20in=20AjaxPage?=
 =?UTF-8?q?=20as=20pages=20with=20"application/json"=20content=20type=20ac?=
 =?UTF-8?q?tually=20return=20the=20HTML=20templates...=20=F0=9F=A4=A6?=
 =?UTF-8?q?=E2=80=8D=E2=99=82=EF=B8=8F(eg.=20breaks=20the=20autocomplete?=
 =?UTF-8?q?=20results)=20-=20Fix=20only=20for=20ext.=20key=20modal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/ui.extkeywidget.class.inc.php     |  1 +
 .../backoffice/ajaxpage/layout.html.twig      | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index 3350fdce0..ae5176482 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -944,6 +944,7 @@ HTML
 $('#ac_create_{$this->iId}').dialog({ width: 'auto', height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true});
 $('#dcr_{$this->iId} form').removeAttr('onsubmit');
 $('#dcr_{$this->iId} form').on('submit.uilinksWizard', oACWidget_{$this->iId}.DoCreateObject);
+CombodoTooltip.InitAllNonInstantiatedTooltips($('#ac_create_{$this->iId}'));
 JS
 		);
 	}
diff --git a/templates/pages/backoffice/ajaxpage/layout.html.twig b/templates/pages/backoffice/ajaxpage/layout.html.twig
index bc04fd125..82c1fd51d 100644
--- a/templates/pages/backoffice/ajaxpage/layout.html.twig
+++ b/templates/pages/backoffice/ajaxpage/layout.html.twig
@@ -68,19 +68,16 @@
                 }
             </script>
         {% endblock %}
+    {% else %}
+        {% block iboPageJsInlineOnDomReady %}
+            {% for sJsInlineOnDomReady in aPage.aJsInlineOnDomReady %}
+                <script type="text/javascript">
+                {{ sJsInlineOnDomReady|raw }}
+                </script>
+            {% endfor %}
+        {% endblock %}
     {% endif %}
 
-    {% block iboPageJsInlineOnDomReady %}
-        {% for sJsInlineOnDomReady in aPage.aJsInlineOnDomReady %}
-            <script type="text/javascript">
-            {{ sJsInlineOnDomReady|raw }}
-            </script>
-        {% endfor %}
-        <script type="application/javascript">
-        CombodoTooltip.InitAllNonInstantiatedTooltips($('body'));
-        </script>
-    {% endblock %}
-
     {% if aDeferredBlocks is not empty %}
         {# TODO 3.0.0 #}
         {# <script type="text/javascript"> #}