Merge pull request #14 from Seb33300/remove-fn

yajra · web-flow · commit 03deba280b39 · 2025-04-28T15:52:32.000+08:00
Use DataTable instead of $.fn.dataTable
diff --git a/js/buttons/add.js b/js/buttons/add.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.add = {
+    DataTable.ext.buttons.add = {
         name: 'add',
         className: 'buttons-add btn-success',
         text: '<i class="bi bi-plus"></i> New',
diff --git a/js/buttons/ajax.js b/js/buttons/ajax.js
@@ -25,7 +25,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.ajax = {
+    DataTable.ext.buttons.ajax = {
         name: 'ajax',
         extend: 'selectedSingle',
         className: 'buttons-ajax',
diff --git a/js/buttons/ajaxBatch.js b/js/buttons/ajaxBatch.js
@@ -13,7 +13,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.ajaxBatch = {
+    DataTable.ext.buttons.ajaxBatch = {
         name: 'ajaxBatch',
         extend: 'selected',
         className: 'buttons-ajax',
diff --git a/js/buttons/csv.js b/js/buttons/csv.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.csv = {
+    DataTable.ext.buttons.csv = {
         name: 'csv',
         className: 'buttons-csv btn-primary',
         titleAttr: 'Export as CSV',
diff --git a/js/buttons/duplicate.js b/js/buttons/duplicate.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.duplicate = {
+    DataTable.ext.buttons.duplicate = {
         name: 'duplicate',
         extend: 'selected',
         className: 'buttons-duplicate btn-success',
diff --git a/js/buttons/duplicateSingle.js b/js/buttons/duplicateSingle.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.duplicateSingle = {
+    DataTable.ext.buttons.duplicateSingle = {
         name: 'duplicateSingle',
         extend: 'selectedSingle',
         className: 'buttons-duplicate btn-success',
diff --git a/js/buttons/excel.js b/js/buttons/excel.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.excel = {
+    DataTable.ext.buttons.excel = {
         name: 'excel',
         className: 'buttons-excel btn-primary',
         titleAttr: 'Export as Excel',
diff --git a/js/buttons/export.js b/js/buttons/export.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.export = {
+    DataTable.ext.buttons.export = {
         name: 'export',
         extend: 'collection',
         className: 'btn-primary',
diff --git a/js/buttons/forceDelete.js b/js/buttons/forceDelete.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.forceDelete = {
+    DataTable.ext.buttons.forceDelete = {
         name: 'forceDelete',
         extend: 'selected',
         className: 'buttons-force-delete btn-danger',
diff --git a/js/buttons/forceDeleteSingle.js b/js/buttons/forceDeleteSingle.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.forceDeleteSingle = {
+    DataTable.ext.buttons.forceDeleteSingle = {
         name: 'forceDeleteSingle',
         extend: 'selectedSingle',
         className: 'buttons-force-delete btn-danger',
diff --git a/js/buttons/pdf.js b/js/buttons/pdf.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.pdf = {
+    DataTable.ext.buttons.pdf = {
         name: 'pdf',
         className: 'buttons-pdf btn-primary',
         titleAttr: 'Export as PDF',
diff --git a/js/buttons/print.js b/js/buttons/print.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.print = {
+    DataTable.ext.buttons.print = {
         name: 'print',
         className: 'buttons-print btn-primary',
         titleAttr: 'Print',
diff --git a/js/buttons/reload.js b/js/buttons/reload.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.reload = {
+    DataTable.ext.buttons.reload = {
         name: 'reload',
         className: 'btn-primary',
         titleAttr: 'Reload',
diff --git a/js/buttons/reset.js b/js/buttons/reset.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.reset = {
+    DataTable.ext.buttons.reset = {
         name: 'reset',
         className: 'btn-primary',
         titleAttr: 'Reset',
@@ -16,7 +16,7 @@ document.addEventListener('DOMContentLoaded', function () {
             $('.dataTable').find(':input').each(function () {
                 $(this).val('');
             }).each(function (e) {
-                let val = $.fn.dataTable.util.escapeRegex($(this).val());
+                let val = DataTable.util.escapeRegex($(this).val());
                 dt.table().column($(this).closest('th').index()).search(val ? val : '', false, true);
             });
             dt.search('').draw();
diff --git a/js/buttons/restore.js b/js/buttons/restore.js
@@ -7,7 +7,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.restore = {
+    DataTable.ext.buttons.restore = {
         name: 'restore',
         extend: 'selected',
         className: 'buttons-restore btn-success',
diff --git a/js/buttons/softDeletes.js b/js/buttons/softDeletes.js
@@ -22,7 +22,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.withTrashed = {
+    DataTable.ext.buttons.withTrashed = {
         name: 'withTrashed',
         className: 'buttons-toggle',
         text: '<i class="bi bi-square"></i> Show Deleted',
@@ -63,7 +63,7 @@ document.addEventListener('DOMContentLoaded', function () {
      *     filters[onlyTrashed] = 0 / 1
      *
      */
-    $.fn.dataTable.ext.buttons.onlyTrashed = {
+    DataTable.ext.buttons.onlyTrashed = {
         name: 'onlyTrashed',
         className: 'buttons-toggle',
         text: '<i class="bi bi-square"></i> Only Deleted',
diff --git a/js/buttons/toggleScope.js b/js/buttons/toggleScope.js
@@ -15,7 +15,7 @@
  *     scopes[onlyDeleted] = 0 / 1
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.toggleScope = {
+    DataTable.ext.buttons.toggleScope = {
         name: 'toggleScope',
         className: 'buttons-toggle',
         text: '<i class="bi bi-square"></i> Toggle',
diff --git a/js/buttons/url.js b/js/buttons/url.js
@@ -15,7 +15,7 @@
  *
  */
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.ext.buttons.url = {
+    DataTable.ext.buttons.url = {
         name: 'url',
         extend: 'selectedSingle',
         className: 'buttons-url',
diff --git a/js/dataTables.renderers.js b/js/dataTables.renderers.js
@@ -1,7 +1,7 @@
 "use strict";
 
 document.addEventListener('DOMContentLoaded', function () {
-    $.fn.dataTable.render.badge = function (badgeType) {
+    DataTable.render.badge = function (badgeType) {
         return function (d, type, row) {
             if (!badgeType) {
                 badgeType = 'info';
@@ -11,7 +11,7 @@ document.addEventListener('DOMContentLoaded', function () {
         };
     };
 
-    $.fn.dataTable.render.boolean = function () {
+    DataTable.render.boolean = function () {
         return function (d) {
             let mode = 'danger';
             let label = "N";
@@ -25,13 +25,13 @@ document.addEventListener('DOMContentLoaded', function () {
     };
 
 
-    $.fn.dataTable.render.suffix = function (suffix) {
+    DataTable.render.suffix = function (suffix) {
         return function (d) {
             return d + ' ' + suffix;
         };
     };
 
-    $.fn.dataTable.render.prefix = function (prefix) {
+    DataTable.render.prefix = function (prefix) {
         return function (d) {
             return prefix + ' ' + d;
         };

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*/`
`9`	`9`	`document.addEventListener('DOMContentLoaded', function () {`
`10`		`- $.fn.dataTable.ext.buttons.add = {`
	`10`	`+ DataTable.ext.buttons.add = {`
`11`	`11`	`name: 'add',`
`12`	`12`	`className: 'buttons-add btn-success',`
`13`	`13`	`text: '<i class="bi bi-plus"></i> New',`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*`
`26`	`26`	`*/`
`27`	`27`	`document.addEventListener('DOMContentLoaded', function () {`
`28`		`- $.fn.dataTable.ext.buttons.ajax = {`
	`28`	`+ DataTable.ext.buttons.ajax = {`
`29`	`29`	`name: 'ajax',`
`30`	`30`	`extend: 'selectedSingle',`
`31`	`31`	`className: 'buttons-ajax',`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*/`
`15`	`15`	`document.addEventListener('DOMContentLoaded', function () {`
`16`		`- $.fn.dataTable.ext.buttons.ajaxBatch = {`
	`16`	`+ DataTable.ext.buttons.ajaxBatch = {`
`17`	`17`	`name: 'ajaxBatch',`
`18`	`18`	`extend: 'selected',`
`19`	`19`	`className: 'buttons-ajax',`