Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update datatables.net to 2.0.2. #19340

Merged
merged 4 commits into from
May 2, 2024
Merged

Update datatables.net to 2.0.2. #19340

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48fda66
Update `datatables.net` to `2.0.2`.
maliming Mar 18, 2024
06e4cfd
Compatible with older `dataTables` versions.
maliming Mar 19, 2024
efcb6a5
Merge branch 'dev' into datatables-2
maliming Apr 30, 2024
78d11f2
Add `Compatible Code`.
maliming Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion ...kages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs
View file
Open in desktop
Expand Up @@ -10,6 +10,14 @@ public class DatatablesNetScriptContributor : BundleContributor
{
public override void ConfigureBundle(BundleConfigurationContext context)
{
context.Files.AddIfNotContains("/libs/datatables.net/js/jquery.dataTables.js");
if (context.FileProvider.GetFileInfo("/libs/datatables.net/js/dataTables.min.js").Exists)
{
context.Files.AddIfNotContains("/libs/datatables.net/js/dataTables.min.js");
}
else
{
//TODO: Compatibility code, Remove it after 8.2 rc1.
context.Files.AddIfNotContains("/libs/datatables.net/js/jquery.dataTables.js");
}
}
}
17 changes: 13 additions & 4 deletions ...hared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
View file
Open in desktop
Expand Up @@ -240,10 +240,17 @@ var abp = abp || {};

if (tableInstance.aoColumns) {
columns = tableInstance.aoColumns;
} else {
} else if (abp.utils.isFunction(tableInstance.fnSettings)) {
columns = tableInstance.fnSettings().aoColumns;
}

if (!columns && abp.utils.isFunction(tableInstance.api)) {
var settings = tableInstance.api().settings();
if (settings.length === 1 && settings[0].aoColumns) {
columns = settings[0].aoColumns;
}
}

if (!columns) {
return;
}
Expand Down Expand Up @@ -271,16 +278,18 @@ var abp = abp || {};
}
};

var _existingApiRenderRowActionsFunction = $.fn.dataTableExt.oApi.renderRowActions;
$.fn.dataTableExt.oApi.renderRowActions =
if ($.fn.dataTableExt.oApi) {
var _existingApiRenderRowActionsFunction = $.fn.dataTableExt.oApi.renderRowActions;
$.fn.dataTableExt.oApi.renderRowActions =
function (tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull) {
if (_existingApiRenderRowActionsFunction) {
_existingApiRenderRowActionsFunction(tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull);
}

renderRowActions(tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull);
};

}

if (!$.fn.dataTable) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion npm/packs/datatables.net-bs5/package.json
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
},
"dependencies": {
"@abp/datatables.net": "~8.1.1",
"datatables.net-bs5": "^1.11.4"
"datatables.net-bs5": "^2.0.2"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431",
"homepage": "https://abp.io",
Expand Down
2 changes: 1 addition & 1 deletion npm/packs/datatables.net/abp.resourcemapping.js
View file
Open in desktop
@@ -1,5 +1,5 @@
module.exports = {
mappings: {
"@node_modules/datatables.net/js/jquery.dataTables.js": "@libs/datatables.net/js/"
"@node_modules/datatables.net/js/dataTables.min.js": "@libs/datatables.net/js/"
}
}
2 changes: 1 addition & 1 deletion npm/packs/datatables.net/package.json
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@abp/jquery": "~8.1.1",
"datatables.net": "^1.11.4"
"datatables.net": "^2.0.2"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431",
"homepage": "https://abp.io",
Expand Down