From 2b69ca2f04ce6525528b95f745f6fd080c8b420b Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Mon, 22 Feb 2021 13:36:26 +0100
Subject: [PATCH] Change da77439 events to use DataTables builtin events
 instead of custom ones

---
 .../2.x/itop-attachments/renderers.itop-attachments.php   | 2 +-
 templates/base/components/datatable/layout.ready.js.twig  | 2 --
 .../base/components/datatable/static/layout.ready.js.twig | 8 +-------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/datamodels/2.x/itop-attachments/renderers.itop-attachments.php b/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
index 5b714845a..859463201 100644
--- a/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
@@ -454,7 +454,7 @@ class TableDetailsAttachmentsRenderer extends AbstractAttachmentsRenderer
 		$sTableId = $oAttachmentTableBlock->GetId();
 		$this->oPage->add_script(
 <<<JS
-$('#$sTableId').on('inited drawn', function(){
+$('#$sTableId').on('init.dt draw.dt', function(){
 	CombodoTooltip.InitAllNonInstantiatedTooltips($(this), true);
 });
 JS
diff --git a/templates/base/components/datatable/layout.ready.js.twig b/templates/base/components/datatable/layout.ready.js.twig
index 4e42889ba..989f5d753 100644
--- a/templates/base/components/datatable/layout.ready.js.twig
+++ b/templates/base/components/datatable/layout.ready.js.twig
@@ -108,7 +108,6 @@ var oTable{{ sListId }} = $('#{{ oUIBlock.GetId() }}').DataTable({
         {
             $(this).closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info').show();
         }
-        $('#{{ oUIBlock.GetId() }}').trigger('drawn');
     },
     {% endif %}
     rowId: "id",
@@ -184,7 +183,6 @@ var oTable{{ sListId }} = $('#{{ oUIBlock.GetId() }}').DataTable({
             this.parent().find('.dataTables_paginate').hide();
             this.parent().find('.dataTables_length').hide();
         }
-        $('#{{ oUIBlock.GetId() }}').trigger('inited');
     }
 });
 
diff --git a/templates/base/components/datatable/static/layout.ready.js.twig b/templates/base/components/datatable/static/layout.ready.js.twig
index 0ae0a8366..4d778ece3 100644
--- a/templates/base/components/datatable/static/layout.ready.js.twig
+++ b/templates/base/components/datatable/static/layout.ready.js.twig
@@ -46,11 +46,5 @@ $('#{{ oUIBlock.GetId() }}').DataTable({
             sortable: true
         },
         {% endfor %}
-    ],
-    initComplete: function () {
-        $('#{{ oUIBlock.GetId() }}').trigger('inited');
-    },
-    drawCallback: function(){
-        $('#{{ oUIBlock.GetId() }}').trigger('drawn');
-    }
+    ]
 });
\ No newline at end of file