From f98ba1594c56949f0aca72e0f53392eb6af19124 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Wed, 28 Jul 2021 13:53:22 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03705=20-=20Migrate=20module=20to=20new?=
 =?UTF-8?q?=20UIBlock=20system=20:=20Kanban=20board=20-=20css=20and=20dict?=
 =?UTF-8?q?ionnary=20in=20ajax=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backoffice/ajaxpage/layout.html.twig      | 79 ++-----------------
 1 file changed, 7 insertions(+), 72 deletions(-)

diff --git a/templates/pages/backoffice/ajaxpage/layout.html.twig b/templates/pages/backoffice/ajaxpage/layout.html.twig
index a538340128..8ad823abde 100644
--- a/templates/pages/backoffice/ajaxpage/layout.html.twig
+++ b/templates/pages/backoffice/ajaxpage/layout.html.twig
@@ -37,20 +37,11 @@
             <script type="text/javascript">
             window['{{ sPromiseId }}'] = new Promise(function(resolve, reject){
                 var aFilesToLoad{{ sId }} = [];
-                {# manage Dictionary file if exist #}
-                var sUrlDictFile = '';
-                {% if aPage.sDictScript is not empty %}
-                if ($.inArray('{{ aPage.sDictScript|raw }}', aListJsFiles) == -1)
-                {
-                    sUrlDictFile = "{{ aPage.sDictScript|raw }}";
-                    aListJsFiles.push(sUrlDictFile);
-                }
-                {% endif %}
                 {# manage the other Js File #}
                 {% for sJsFile in aPage.aJsFiles %}
                 if ($.inArray('{{ sJsFile|raw }}', aListJsFiles) == -1)
                 {
-                    aFilesToLoad{{ sId }}.push('{{ sJsFile|raw|add_itop_version }}');
+                    aFilesToLoad{{ sId }}.push('{{ sJsFile|add_itop_version|raw }}');
                     aListJsFiles.push("{{ sJsFile|raw }}");
                 }
                 {% endfor %}
@@ -81,27 +72,7 @@
                                     }
                                 });
                     };
-                    {# first load Dictionary if exist #}
-                    if (sUrlDictFile != '')
-                    {
-                        $.ajax({
-                            url: '{{ aPage.sDictScript|raw }}',
-                            dataType: 'script',
-                            cache: true
-                        }).done(function (data) {
-                            if (Dict != undefined && data.startsWith("var aDictEntries = {\""))
-                            {
-                                eval(data);
-                                $.extend(Dict._entries, aDictEntries);
-                            }
-                        }).then(function () {
-                            fLoadScript{{ sId }}();
-                        });
-                    }
-                    else
-                    {
-                        fLoadScript{{ sId }}();
-                    }
+                    fLoadScript{{ sId }}();
                 }
                 else
                 {
@@ -115,50 +86,14 @@
         {% endblock %}
     {% else %}
         {% block iboPageJsInlineOnDomReady %}
-
-            {# first load Dictionnary if exist #}
-            {% if aPage.sDictScript is not empty %}
+            {% for sJsInlineOnDomReady in aPage.aJsInlineOnDomReady %}
                 <script type="text/javascript">
-                window['{{ sPromiseId }}'] = new Promise(function(resolve, reject){
-                    if ($.inArray('{{ aPage.sDictScript|raw }}', aListJsFiles) == -1)
-                    {
-                        aListJsFiles.push("{{ aPage.sDictScript|raw }}");
-                        $.ajax({
-                            url: '{{ aPage.sDictScript|raw }}',
-                            dataType: 'script',
-                            cache: true
-                        }).done(function (data) {
-                            if (Dict != undefined && data.startsWith("var aDictEntries = {\""))
-                            {
-                                eval(data);
-                                $.extend(Dict._entries, aDictEntries);
-                            }
-                        }).then(function () {
-                            {% for sJsInlineOnDomReady in aPage.aJsInlineOnDomReady %}
-                            {{ sJsInlineOnDomReady|raw }}
-                            {% endfor %}
-                            resolve();
-                        });
-                    }
-                    else
-                    {
-                        {% for sJsInlineOnDomReady in aPage.aJsInlineOnDomReady %}
-                        {{ sJsInlineOnDomReady|raw }}
-                        {% endfor %}
-                        resolve();
-                    }
+                window['{{ sPromiseId }}'] = new Promise(function (resolve, reject) {
+                    {{ sJsInlineOnDomReady|raw }}
+                    resolve();
                 });
                 </script>
-            {% else %}
-                {% for sJsInlineOnDomReady in aPage.aJsInlineOnDomReady %}
-                    <script type="text/javascript">
-                        window['{{ sPromiseId }}'] = new Promise(function(resolve, reject){
-                            {{ sJsInlineOnDomReady|raw }}
-                            resolve();
-                        });
-                    </script>
-                {% endfor %}
-            {% endif %}
+            {% endfor %}
         {% endblock %}
     {% endif %}