Skip to content

Commit e77bf8a

Browse files
AllanJardAllanJard
committed
Updating package for DataTables 3
1 parent 6e7dd7a commit e77bf8a

8 files changed

Lines changed: 288 additions & 299 deletions

‎css/dataTables.jqueryui.css‎

Lines changed: 202 additions & 195 deletions
Large diffs are not rendered by default.

‎css/dataTables.jqueryui.min.css‎

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

‎js/dataTables.jqueryui.js‎

Lines changed: 39 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,45 @@
1-
/*! DataTables jQuery UI integration
1+
/*! DataTables jQuery UI integration 3.0.0-beta.2
22
* © SpryMedia Ltd - datatables.net/license
33
*/
44

5-
(function( factory ){
6-
if ( typeof define === 'function' && define.amd ) {
5+
(function(factory){
6+
if (typeof define === 'function' && define.amd) {
77
// AMD
8-
define( ['jquery', 'datatables.net'], function ( $ ) {
9-
return factory( $, window, document );
10-
} );
8+
define(['datatables.net'], function (dt) {
9+
return factory(window, document, dt);
10+
});
1111
}
12-
else if ( typeof exports === 'object' ) {
12+
else if (typeof exports === 'object') {
1313
// CommonJS
14-
var jq = require('jquery');
15-
var cjsRequires = function (root, $) {
16-
if ( ! $.fn.dataTable ) {
17-
require('datatables.net')(root, $);
14+
var cjsRequires = function (root) {
15+
if (! root.DataTable) {
16+
require('datatables.net')(root);
1817
}
1918
};
2019

2120
if (typeof window === 'undefined') {
22-
module.exports = function (root, $) {
23-
if ( ! root ) {
21+
module.exports = function (root) {
22+
if (! root) {
2423
// CommonJS environments without a window global must pass a
2524
// root. This will give an error otherwise
2625
root = window;
2726
}
2827

29-
if ( ! $ ) {
30-
$ = jq( root );
31-
}
32-
33-
cjsRequires( root, $ );
34-
return factory( $, root, root.document );
28+
cjsRequires(root);
29+
return factory(root, root.document, root.DataTable);
3530
};
3631
}
3732
else {
38-
cjsRequires( window, jq );
39-
module.exports = factory( jq, window, window.document );
33+
cjsRequires(window);
34+
module.exports = factory(window, window.document, window.DataTable);
4035
}
4136
}
4237
else {
4338
// Browser
44-
factory( jQuery, window, document );
39+
factory(window, document, window.DataTable);
4540
}
46-
}(function( $, window, document ) {
41+
}(function(window, document, DataTable) {
4742
'use strict';
48-
var DataTable = $.fn.dataTable;
49-
5043

5144

5245
/**
@@ -56,30 +49,28 @@ var DataTable = $.fn.dataTable;
5649
* controls using jQuery UI. See https://datatables.net/manual/styling/jqueryui
5750
* for further information.
5851
*/
59-
60-
$.extend( true, DataTable.ext.classes, {
61-
container: 'dt-container dt-jqueryui',
62-
paging: {
63-
active: 'ui-state-disabled',
64-
button: 'fg-button ui-button ui-state-default',
65-
container: 'dt-paging fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi',
66-
disabled: 'ui-state-disabled'
67-
},
68-
thead: {
69-
cell: 'ui-state-default fg-toolbar ui-toolbar ui-widget-header'
70-
},
71-
tfoot: {
72-
cell: 'ui-state-default ui-widget-header'
73-
},
74-
layout: {
75-
row: 'dt-layout-row ui-helper-clearfix',
76-
tableCell: 'table',
77-
}
78-
} );
79-
52+
DataTable.util.object.assignDeep(DataTable.ext.classes, {
53+
container: 'dt-container dt-jqueryui',
54+
paging: {
55+
active: 'ui-state-disabled',
56+
button: 'fg-button ui-button ui-state-default',
57+
container: 'dt-paging fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi',
58+
disabled: 'ui-state-disabled'
59+
},
60+
thead: {
61+
cell: 'ui-state-default fg-toolbar ui-toolbar ui-widget-header'
62+
},
63+
tfoot: {
64+
cell: 'ui-state-default ui-widget-header'
65+
},
66+
layout: {
67+
row: 'dt-layout-row ui-helper-clearfix',
68+
tableCell: 'table'
69+
}
70+
});
8071
// Set the defaults for DataTables initialisation
81-
$.extend(true, DataTable.defaults, {
82-
renderer: 'jqueryui'
72+
DataTable.util.object.assignDeep(DataTable.defaults, {
73+
renderer: 'jqueryui'
8374
});
8475

8576

‎js/dataTables.jqueryui.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/dataTables.jqueryui.min.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! DataTables jQuery UI integration
1+
/*! DataTables jQuery UI integration 3.0.0-beta.2
22
* © SpryMedia Ltd - datatables.net/license
33
*/
4-
import jQuery from"jquery";import DataTable from"datatables.net";let $=jQuery;$.extend(!0,DataTable.ext.classes,{container:"dt-container dt-jqueryui",paging:{active:"ui-state-disabled",button:"fg-button ui-button ui-state-default",container:"dt-paging fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi",disabled:"ui-state-disabled"},thead:{cell:"ui-state-default fg-toolbar ui-toolbar ui-widget-header"},tfoot:{cell:"ui-state-default ui-widget-header"},layout:{row:"dt-layout-row ui-helper-clearfix",tableCell:"table"}}),$.extend(!0,DataTable.defaults,{renderer:"jqueryui"});export default DataTable;
4+
import DataTable,{Api,Dom,util}from"datatables.net";DataTable.util.object.assignDeep(DataTable.ext.classes,{container:"dt-container dt-jqueryui",paging:{active:"ui-state-disabled",button:"fg-button ui-button ui-state-default",container:"dt-paging fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi",disabled:"ui-state-disabled"},thead:{cell:"ui-state-default fg-toolbar ui-toolbar ui-widget-header"},tfoot:{cell:"ui-state-default ui-widget-header"},layout:{row:"dt-layout-row ui-helper-clearfix",tableCell:"table"}}),DataTable.util.object.assignDeep(DataTable.defaults,{renderer:"jqueryui"});export default DataTable;export{Api,DataTable,Dom,util};

‎js/dataTables.jqueryui.mjs‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
/*! DataTables jQuery UI integration
1+
/*! DataTables jQuery UI integration 3.0.0-beta.2
22
* © SpryMedia Ltd - datatables.net/license
33
*/
44

5-
import jQuery from 'jquery';
6-
import DataTable from 'datatables.net';
7-
8-
// Allow reassignment of the $ variable
9-
let $ = jQuery;
10-
5+
import DataTable, {Api, Dom, util} from 'datatables.net';
116

127
/**
138
* DataTables integration for jQuery UI.
@@ -16,31 +11,30 @@ let $ = jQuery;
1611
* controls using jQuery UI. See https://datatables.net/manual/styling/jqueryui
1712
* for further information.
1813
*/
19-
20-
$.extend( true, DataTable.ext.classes, {
21-
container: 'dt-container dt-jqueryui',
22-
paging: {
23-
active: 'ui-state-disabled',
24-
button: 'fg-button ui-button ui-state-default',
25-
container: 'dt-paging fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi',
26-
disabled: 'ui-state-disabled'
27-
},
28-
thead: {
29-
cell: 'ui-state-default fg-toolbar ui-toolbar ui-widget-header'
30-
},
31-
tfoot: {
32-
cell: 'ui-state-default ui-widget-header'
33-
},
34-
layout: {
35-
row: 'dt-layout-row ui-helper-clearfix',
36-
tableCell: 'table',
37-
}
38-
} );
39-
14+
DataTable.util.object.assignDeep(DataTable.ext.classes, {
15+
container: 'dt-container dt-jqueryui',
16+
paging: {
17+
active: 'ui-state-disabled',
18+
button: 'fg-button ui-button ui-state-default',
19+
container: 'dt-paging fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi',
20+
disabled: 'ui-state-disabled'
21+
},
22+
thead: {
23+
cell: 'ui-state-default fg-toolbar ui-toolbar ui-widget-header'
24+
},
25+
tfoot: {
26+
cell: 'ui-state-default ui-widget-header'
27+
},
28+
layout: {
29+
row: 'dt-layout-row ui-helper-clearfix',
30+
tableCell: 'table'
31+
}
32+
});
4033
// Set the defaults for DataTables initialisation
41-
$.extend(true, DataTable.defaults, {
42-
renderer: 'jqueryui'
34+
DataTable.util.object.assignDeep(DataTable.defaults, {
35+
renderer: 'jqueryui'
4336
});
4437

4538

4639
export default DataTable;
40+
export { Api, DataTable, Dom, util };

‎nuget.nuspec‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
4-
<version>2.3.8</version>
4+
<version>3.0.0-beta.2</version>
55
<id>datatables.net-jqui</id>
66
<description>This is DataTables with styling for [jQueryUI](http://jqueryui.com/)</description>
7-
<repository type="git" url="https://github.com/DataTables/Dist-DataTables-jQueryUI.git"/>
7+
<repository type="git" url="https://github.com/DataTables/DataTablesSrc"/>
88
<authors>SpryMedia Ltd</authors>
99
<projectUrl>http://datatables.net</projectUrl>
1010
<license type="expression">MIT</license>
11-
<tags>jQuery UI jQueryUI Datatables jQuery table</tags>
11+
<tags>jQuery UI jQueryUI Datatables table</tags>
1212
<dependencies>
13-
<dependency id="datatables.net" version="2.3.2"/>
13+
<dependency id="datatables.net" version="3.0.0-0"/>
1414
<dependency id="jquery.ui" version="1.*"/>
1515
</dependencies>
1616
<contentFiles>
1717
<files include="**/*" buildAction="Content"/>
1818
</contentFiles>
19+
<readme>Readme.md</readme>
1920
</metadata>
2021
<files>
22+
<file src="Readme.md" target=""/>
2123
<file src="js/dataTables.jqueryui.js" target="content\Scripts"/>
2224
<file src="js/dataTables.jqueryui.js" target="contentFiles\any\any\wwwroot\js"/>
2325
<file src="js/dataTables.jqueryui.min.js" target="content\Scripts"/>
@@ -32,4 +34,3 @@
3234
<file src="css/dataTables.jqueryui.min.css" target="contentFiles\any\any\wwwroot\css"/>
3335
</files>
3436
</package>
35-

‎package.json‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "datatables.net-jqui",
3-
"description": "DataTables for jQuery with styling for [jQueryUI](http://jqueryui.com/)",
3+
"description": "DataTables with styling for [jQueryUI](http://jqueryui.com/)",
44
"main": "js/dataTables.jqueryui.js",
55
"module": "js/dataTables.jqueryui.mjs",
66
"style": "css/dataTables.jqueryui.css",
77
"types": "./types/dataTables.jqueryui.d.ts",
8-
"version": "2.3.8",
8+
"version": "3.0.0-beta.2",
99
"files": [
1010
"css/**/*.css",
1111
"js/**/*.js",
@@ -16,25 +16,13 @@
1616
"jQuery UI",
1717
"jQueryUI",
1818
"Datatables",
19-
"jQuery",
2019
"table",
2120
"filter",
2221
"sort"
2322
],
2423
"dependencies": {
25-
"datatables.net": "2.3.8",
26-
"jquery": ">=1.7"
24+
"datatables.net": "3.0.0-0"
2725
},
28-
"moduleType": [
29-
"globals",
30-
"amd",
31-
"node"
32-
],
33-
"ignore": [
34-
"composer.json",
35-
"datatables.json",
36-
"package.json"
37-
],
3826
"author": {
3927
"name": "SpryMedia Ltd",
4028
"url": "http://datatables.net"
@@ -44,6 +32,6 @@
4432
"license": "MIT",
4533
"repository": {
4634
"type": "git",
47-
"url": "https://github.com/DataTables/Dist-DataTables-jQueryUI.git"
35+
"url": "git+https://github.com/DataTables/DataTablesSrc.git"
4836
}
4937
}

0 commit comments

Comments
 (0)