Skip to content

Commit 1fd64eb

Browse files
author
dtbuild
committed
4fcbb8f4f2f1f9631a60e637c9d120378d5aaa3c
Sync to source repo @2233e6926472f98a719e9d28464f49c54f4680df
1 parent 418cef1 commit 1fd64eb

5 files changed

Lines changed: 10 additions & 66 deletions

File tree

datatables.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
],
1515
"src-repo": "http://github.com/DataTables/Responsive",
1616
"last-tag": "3.0.8",
17-
"last-sync": "4fcbb8f4f2f1f9631a60e637c9d120378d5aaa3c"
17+
"last-sync": "2233e6926472f98a719e9d28464f49c54f4680df"
1818
}

js/responsive.bootstrap4.js

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,6 @@
22
* © SpryMedia Ltd - datatables.net/license
33
*/
44

5-
(function( factory ){
6-
if ( typeof define === 'function' && define.amd ) {
7-
// AMD
8-
define( ['jquery', 'datatables.net-bs4', 'datatables.net-responsive'], function ( $ ) {
9-
return factory( $, window, document );
10-
} );
11-
}
12-
else if ( typeof exports === 'object' ) {
13-
// CommonJS
14-
var jq = require('jquery');
15-
var cjsRequires = function (root, $) {
16-
if ( ! $.fn.dataTable ) {
17-
require('datatables.net-bs4')(root, $);
18-
}
19-
20-
if ( ! $.fn.dataTable.Responsive ) {
21-
require('datatables.net-responsive')(root, $);
22-
}
23-
};
24-
25-
if (typeof window === 'undefined') {
26-
module.exports = function (root, $) {
27-
if ( ! root ) {
28-
// CommonJS environments without a window global must pass a
29-
// root. This will give an error otherwise
30-
root = window;
31-
}
32-
33-
if ( ! $ ) {
34-
$ = jq( root );
35-
}
36-
37-
cjsRequires( root, $ );
38-
return factory( $, root, root.document );
39-
};
40-
}
41-
else {
42-
cjsRequires( window, jq );
43-
module.exports = factory( jq, window, window.document );
44-
}
45-
}
46-
else {
47-
// Browser
48-
factory( jQuery, window, document );
49-
}
50-
}(function( $, window, document ) {
51-
'use strict';
52-
var DataTable = $.fn.dataTable;
53-
54-
55-
565
var _display = DataTable.Responsive.display;
576
var _original = _display.modal;
587
var _modal = $(
@@ -113,7 +62,3 @@ _display.modal = function (options) {
11362
}
11463
};
11564
};
116-
117-
118-
return DataTable;
119-
}));

js/responsive.bootstrap4.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/responsive.bootstrap4.min.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! Bootstrap 4 integration for DataTables' Responsive
2-
* © SpryMedia Ltd - datatables.net/license
1+
/*! Responsive Bootstrap 4 styling 4.0.0-beta.1 for DataTables
2+
* Copyright (c) SpryMedia Ltd - datatables.net/license
33
*/
4-
import jQuery from"jquery";import DataTable from"datatables.net-bs4";import Responsive from"datatables.net-responsive";let $=jQuery;var _display=DataTable.Responsive.display,_original=_display.modal,_modal=$('<div class="modal fade dtr-bs-modal" role="dialog"><div class="modal-dialog" role="document"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><div class="modal-body"/></div></div></div>');_display.modal=function(n){return function(a,d,e,o){if($.fn.modal){var l,i,t=e();if(!1===t)return!1;if(d){if(!$.contains(document,_modal[0])||a.index()!==_modal.data("dtr-row-idx"))return null;_modal.find("div.modal-body").empty().append(t)}else n&&n.header&&(i=(l=_modal.find("div.modal-header")).find("button").detach(),l.empty().append('<h4 class="modal-title">'+n.header(a)+"</h4>").append(i)),_modal.find("div.modal-body").empty().append(t),_modal.data("dtr-row-idx",a.index()).one("hidden.bs.modal",o).appendTo("body").modal();return!0}return _original(a,d,e,o)}};export default DataTable;
4+
import DataTable from"datatables.net-bs4";import Responsive from"datatables.net-responsive";var $=DataTable.use("jq"),_display=DataTable.Responsive.display,_original=_display.modal,_modal=$('<div class="modal fade dtr-bs-modal" role="dialog"><div class="modal-dialog" role="document"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button></div><div class="modal-body"/></div></div></div>');_display.modal=function(n){return function(a,d,e,o){if($.fn.modal){var l,i,t=e();if(!1===t)return!1;if(d){if(!$.contains(document,_modal[0])||a.index()!==_modal.data("dtr-row-idx"))return null;_modal.find("div.modal-body").empty().append(t)}else n&&n.header&&(i=(l=_modal.find("div.modal-header")).find("button").detach(),l.empty().append('<h4 class="modal-title">'+n.header(a)+"</h4>").append(i)),_modal.find("div.modal-body").empty().append(t),_modal.data("dtr-row-idx",a.index()).one("hidden.bs.modal",o).appendTo("body").modal();return!0}return _original(a,d,e,o)}};export default DataTable;

js/responsive.bootstrap4.mjs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
/*! Bootstrap 4 integration for DataTables' Responsive
2-
* © SpryMedia Ltd - datatables.net/license
1+
/*! Responsive Bootstrap 4 styling 4.0.0-beta.1 for DataTables
2+
* Copyright (c) SpryMedia Ltd - datatables.net/license
33
*/
44

5-
import jQuery from 'jquery';
65
import DataTable from 'datatables.net-bs4';
76
import Responsive from 'datatables.net-responsive';
87

9-
// Allow reassignment of the $ variable
10-
let $ = jQuery;
11-
128

9+
// Note that BS4's JS depends upon jQuery, so we use it here
10+
var $ = DataTable.use('jq');
1311
var _display = DataTable.Responsive.display;
1412
var _original = _display.modal;
1513
var _modal = $(
@@ -73,3 +71,4 @@ _display.modal = function (options) {
7371

7472

7573
export default DataTable;
74+

0 commit comments

Comments
 (0)