Skip to content

Commit

Permalink
Sync DistRepos
Browse files Browse the repository at this point in the history
  • Loading branch information
AllanJard committed Sep 25, 2022
1 parent adee1c1 commit bca8373
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 27 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.2.9",
"version": "2.3.0",
"name": "datatables.net/datatables.net-responsive-bs5",
"description": "In the modern world of responsive web design tables can often cause a particular problem for designers due to their row based layout. Responsive is an extension for DataTables that resolves that problem by optimising the table's layout for different screen sizes through the dynamic insertion and removal of columns from the table. This is Responsive for DataTables with styling for [Bootstrap5](https://getbootstrap.com/)",
"support": {
Expand Down Expand Up @@ -27,7 +27,7 @@
"table"
],
"require": {
"datatables.net/datatables.net-responsive": ">=2.2.9",
"datatables.net/datatables.net-bs5": ">=1.11.5"
"datatables.net/datatables.net-responsive": ">=2.3.0",
"datatables.net/datatables.net-bs5": ">=1.12.1"
}
}
5 changes: 5 additions & 0 deletions css/responsive.bootstrap5.css
Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,8 @@ div.dtr-modal div.dtr-modal-background {
div.dtr-bs-modal table.table tr:first-child td {
border-top: none;
}

table.dataTable.table-bordered th.dtr-control.dtr-hidden + *,
table.dataTable.table-bordered td.dtr-control.dtr-hidden + * {
border-left-width: 1px;
}
2 changes: 1 addition & 1 deletion css/responsive.bootstrap5.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 16 additions & 5 deletions js/responsive.bootstrap5.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

/*! Bootstrap 5 integration for DataTables' Responsive
* ©2021 SpryMedia Ltd - datatables.net/license
* © SpryMedia Ltd - datatables.net/license
*/

(function( factory ){
Expand All @@ -13,17 +14,26 @@
// CommonJS
module.exports = function (root, $) {
if ( ! root ) {
// CommonJS environments without a window global must pass a
// root. This will give an error otherwise
root = window;
}

if ( ! $ || ! $.fn.dataTable ) {
$ = require('datatables.net-bs5')(root, $).$;
if ( ! $ ) {
$ = typeof window !== 'undefined' ? // jQuery's factory checks for a global window
require('jquery') :
require('jquery')( root );
}

if ( ! $.fn.dataTable ) {
require('datatables.net-bs5')(root, $);
}

if ( ! $.fn.dataTable.Responsive ) {
if ( ! $.fn.dataTable ) {
require('datatables.net-responsive')(root, $);
}


return factory( $, root, root.document );
};
}
Expand All @@ -36,6 +46,7 @@
var DataTable = $.fn.dataTable;



var _display = DataTable.Responsive.display;
var _original = _display.modal;
var _modal = $(
Expand Down Expand Up @@ -97,5 +108,5 @@ _display.modal = function ( options ) {
};


return DataTable.Responsive;
return DataTable;
}));
13 changes: 1 addition & 12 deletions js/responsive.bootstrap5.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions nuget.nuspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<version>2.2.9</version>
<version>2.3.0</version>
<id>datatables.net-responsive-bs5</id>
<description>This is Responsive for DataTables with styling for [Bootstrap5](https://getbootstrap.com/)</description>
<repository type="git" url="https://github.com/DataTables/Dist-DataTables-Responsive-Bootstrap5.git"/>
Expand All @@ -10,8 +10,8 @@
<license type="expression">MIT</license>
<tags>Responsive Bootstrap Bootstrap5 Datatables jQuery table</tags>
<dependencies>
<dependency id="datatables.net-responsive" version="2.2.9"/>
<dependency id="datatables.net-bs5" version="1.11.5"/>
<dependency id="datatables.net-responsive" version="2.3.0"/>
<dependency id="datatables.net-bs5" version="1.12.1"/>
</dependencies>
<contentFiles>
<files include="**/*" buildAction="Content"/>
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"main": "js/responsive.bootstrap5.js",
"style": "css/responsive.bootstrap5.css",
"types": "./types/responsive.bootstrap5.d.ts",
"version": "2.2.9",
"version": "2.3.0",
"files": [
"css/**/*.css",
"js/**/*.js",
Expand All @@ -21,8 +21,8 @@
"sort"
],
"dependencies": {
"datatables.net-responsive": ">=2.2.9",
"datatables.net-bs5": ">=1.11.5",
"datatables.net-responsive": ">=2.3.0",
"datatables.net-bs5": ">=1.12.1",
"jquery": ">=1.7"
},
"moduleType": [
Expand Down

0 comments on commit bca8373

Please sign in to comment.