Updating adminlte frontend dependencies

parent 43e03c69
...@@ -132,7 +132,10 @@ div.dataTables_scrollBody > table > tbody > tr:first-child > td { ...@@ -132,7 +132,10 @@ div.dataTables_scrollBody > table > tbody > tr:first-child > td {
border-top: none; border-top: none;
} }
div.dataTables_scrollFoot > table { div.dataTables_scrollFoot > .dataTables_scrollFootInner {
box-sizing: content-box;
}
div.dataTables_scrollFoot > .dataTables_scrollFootInner > table {
margin-top: 0 !important; margin-top: 0 !important;
border-top: none; border-top: none;
} }
......
{ {
"_args": [ "_from": "datatables.net-bs@1.10.16",
[ "_id": "datatables.net-bs@1.10.16",
"datatables.net-bs@1.10.15",
"/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte"
]
],
"_from": "datatables.net-bs@1.10.15",
"_id": "datatables.net-bs@1.10.15",
"_inBundle": false, "_inBundle": false,
"_integrity": "sha1-ssImEAfYTKW1q/VsGO3CJ+DaGk0=", "_integrity": "sha1-sIVPWzdPcTrj20FWx86op2DD3nY=",
"_location": "/datatables.net-bs", "_location": "/datatables.net-bs",
"_phantomChildren": {}, "_phantomChildren": {},
"_requested": { "_requested": {
"type": "version", "type": "version",
"registry": true, "registry": true,
"raw": "datatables.net-bs@1.10.15", "raw": "datatables.net-bs@1.10.16",
"name": "datatables.net-bs", "name": "datatables.net-bs",
"escapedName": "datatables.net-bs", "escapedName": "datatables.net-bs",
"rawSpec": "1.10.15", "rawSpec": "1.10.16",
"saveSpec": null, "saveSpec": null,
"fetchSpec": "1.10.15" "fetchSpec": "1.10.16"
}, },
"_requiredBy": [ "_requiredBy": [
"#USER",
"/" "/"
], ],
"_resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.10.15.tgz", "_resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.10.16.tgz",
"_spec": "1.10.15", "_shasum": "b0854f5b374f713ae3db4156c7cea8a760c3de76",
"_spec": "datatables.net-bs@1.10.16",
"_where": "/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte", "_where": "/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte",
"author": { "author": {
"name": "SpryMedia Ltd", "name": "SpryMedia Ltd",
...@@ -34,11 +30,13 @@ ...@@ -34,11 +30,13 @@
"bugs": { "bugs": {
"url": "https://datatables.net/forums" "url": "https://datatables.net/forums"
}, },
"bundleDependencies": false,
"dependencies": { "dependencies": {
"datatables.net": ">=1.10.9", "datatables.net": "1.10.16",
"jquery": ">=1.7" "jquery": ">=1.7"
}, },
"description": "DataTables for jQuery with styling for [Bootstrap](http://getbootstrap.com/)", "deprecated": false,
"description": "DataTables for jQuery with styling for [Bootstrap 3](http://getbootstrap.com/)",
"files": [ "files": [
"js/dataTables.bootstrap.js", "js/dataTables.bootstrap.js",
"css/dataTables.bootstrap.css" "css/dataTables.bootstrap.css"
...@@ -60,5 +58,5 @@ ...@@ -60,5 +58,5 @@
"url": "git+https://github.com/DataTables/Dist-DataTables-Bootstrap.git" "url": "git+https://github.com/DataTables/Dist-DataTables-Bootstrap.git"
}, },
"style": "css/dataTables.bootstrap.css", "style": "css/dataTables.bootstrap.css",
"version": "1.10.15" "version": "1.10.16"
} }
/*! DataTables 1.10.15 /*! DataTables 1.10.16
* ©2008-2017 SpryMedia Ltd - datatables.net/license * ©2008-2017 SpryMedia Ltd - datatables.net/license
*/ */
/** /**
* @summary DataTables * @summary DataTables
* @description Paginate, search and order HTML tables * @description Paginate, search and order HTML tables
* @version 1.10.15 * @version 1.10.16
* @file jquery.dataTables.js * @file jquery.dataTables.js
* @author SpryMedia Ltd * @author SpryMedia Ltd
* @contact www.datatables.net * @contact www.datatables.net
...@@ -1023,8 +1023,7 @@ ...@@ -1023,8 +1023,7 @@
[ "iCookieDuration", "iStateDuration" ], // backwards compat [ "iCookieDuration", "iStateDuration" ], // backwards compat
[ "oSearch", "oPreviousSearch" ], [ "oSearch", "oPreviousSearch" ],
[ "aoSearchCols", "aoPreSearchCols" ], [ "aoSearchCols", "aoPreSearchCols" ],
[ "iDisplayLength", "_iDisplayLength" ], [ "iDisplayLength", "_iDisplayLength" ]
[ "bJQueryUI", "bJUI" ]
] ); ] );
_fnMap( oSettings.oScroll, oInit, [ _fnMap( oSettings.oScroll, oInit, [
[ "sScrollX", "sX" ], [ "sScrollX", "sX" ],
...@@ -1054,31 +1053,7 @@ ...@@ -1054,31 +1053,7 @@
var oClasses = oSettings.oClasses; var oClasses = oSettings.oClasses;
// @todo Remove in 1.11 $.extend( oClasses, DataTable.ext.classes, oInit.oClasses );
if ( oInit.bJQueryUI )
{
/* Use the JUI classes object for display. You could clone the oStdClasses object if
* you want to have multiple tables with multiple independent classes
*/
$.extend( oClasses, DataTable.ext.oJUIClasses, oInit.oClasses );
if ( oInit.sDom === defaults.sDom && defaults.sDom === "lfrtip" )
{
/* Set the DOM to use a layout suitable for jQuery UI's theming */
oSettings.sDom = '<"H"lfr>t<"F"ip>';
}
if ( ! oSettings.renderer ) {
oSettings.renderer = 'jqueryui';
}
else if ( $.isPlainObject( oSettings.renderer ) && ! oSettings.renderer.header ) {
oSettings.renderer.header = 'jqueryui';
}
}
else
{
$.extend( oClasses, DataTable.ext.classes, oInit.oClasses );
}
$this.addClass( oClasses.sTable ); $this.addClass( oClasses.sTable );
...@@ -2057,6 +2032,9 @@ ...@@ -2057,6 +2032,9 @@
{ {
oOptions.sClass = oOptions.className; oOptions.sClass = oOptions.className;
} }
if ( oOptions.sClass ) {
th.addClass( oOptions.sClass );
}
$.extend( oCol, oOptions ); $.extend( oCol, oOptions );
_fnMap( oCol, oOptions, "sWidth", "sWidthOrig" ); _fnMap( oCol, oOptions, "sWidth", "sWidthOrig" );
...@@ -4831,7 +4809,12 @@ ...@@ -4831,7 +4809,12 @@
} ); } );
for ( var i=0, ien=lengths.length ; i<ien ; i++ ) { for ( var i=0, ien=lengths.length ; i<ien ; i++ ) {
select[0][ i ] = new Option( language[i], lengths[i] ); select[0][ i ] = new Option(
typeof language[i] === 'number' ?
settings.fnFormatNumber( language[i] ) :
language[i],
lengths[i]
);
} }
var div = $('<div><label/></div>').addClass( classes.sLength ); var div = $('<div><label/></div>').addClass( classes.sLength );
...@@ -8053,6 +8036,11 @@ ...@@ -8053,6 +8036,11 @@
_fnDeleteIndex( settings.aiDisplay, row ); _fnDeleteIndex( settings.aiDisplay, row );
_fnDeleteIndex( that[ thatIdx ], row, false ); // maintain local indexes _fnDeleteIndex( that[ thatIdx ], row, false ); // maintain local indexes
// For server-side processing tables - subtract the deleted row from the count
if ( settings._iRecordsDisplay > 0 ) {
settings._iRecordsDisplay--;
}
// Check for an 'overflow' they case for displaying the table // Check for an 'overflow' they case for displaying the table
_fnLengthOverflow( settings ); _fnLengthOverflow( settings );
...@@ -9327,15 +9315,6 @@ ...@@ -9327,15 +9315,6 @@
classes.sSortableAsc+' '+classes.sSortableDesc+' '+classes.sSortableNone classes.sSortableAsc+' '+classes.sSortableDesc+' '+classes.sSortableNone
); );
if ( settings.bJUI ) {
$('th span.'+classes.sSortIcon+ ', td span.'+classes.sSortIcon, thead).detach();
$('th, td', thead).each( function () {
var wrapper = $('div.'+classes.sSortJUIWrapper, this);
$(this).append( wrapper.contents() );
wrapper.detach();
} );
}
// Add the TR elements back into the table in their original order // Add the TR elements back into the table in their original order
jqTbody.children().detach(); jqTbody.children().detach();
jqTbody.append( rows ); jqTbody.append( rows );
...@@ -9433,7 +9412,7 @@ ...@@ -9433,7 +9412,7 @@
* @type string * @type string
* @default Version number * @default Version number
*/ */
DataTable.version = "1.10.15"; DataTable.version = "1.10.16";
/** /**
* Private data store, containing all of the settings objects that are * Private data store, containing all of the settings objects that are
...@@ -10362,26 +10341,6 @@ ...@@ -10362,26 +10341,6 @@
"bInfo": true, "bInfo": true,
/**
* Enable jQuery UI ThemeRoller support (required as ThemeRoller requires some
* slightly different and additional mark-up from what DataTables has
* traditionally used).
* @type boolean
* @default false
*
* @dtopt Features
* @name DataTable.defaults.jQueryUI
*
* @example
* $(document).ready( function() {
* $('#example').dataTable( {
* "jQueryUI": true
* } );
* } );
*/
"bJQueryUI": false,
/** /**
* Allows the end user to select the size of a formatted page from a select * Allows the end user to select the size of a formatted page from a select
* menu (sizes are 10, 25, 50 and 100). Requires pagination (`paginate`). * menu (sizes are 10, 25, 50 and 100). Requires pagination (`paginate`).
...@@ -13662,14 +13621,6 @@ ...@@ -13662,14 +13621,6 @@
*/ */
"_iRecordsDisplay": 0, "_iRecordsDisplay": 0,
/**
* Flag to indicate if jQuery UI marking and classes should be used.
* Note that this parameter will be set by the initialisation routine. To
* set a default use {@link DataTable.defaults}.
* @type boolean
*/
"bJUI": null,
/** /**
* The classes to use for the table * The classes to use for the table
* @type object * @type object
...@@ -14447,59 +14398,6 @@ ...@@ -14447,59 +14398,6 @@
} ); } );
(function() {
// Reused strings for better compression. Closure compiler appears to have a
// weird edge case where it is trying to expand strings rather than use the
// variable version. This results in about 200 bytes being added, for very
// little preference benefit since it this run on script load only.
var _empty = '';
_empty = '';
var _stateDefault = _empty + 'ui-state-default';
var _sortIcon = _empty + 'css_right ui-icon ui-icon-';
var _headerFooter = _empty + 'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix';
$.extend( DataTable.ext.oJUIClasses, DataTable.ext.classes, {
/* Full numbers paging buttons */
"sPageButton": "fg-button ui-button "+_stateDefault,
"sPageButtonActive": "ui-state-disabled",
"sPageButtonDisabled": "ui-state-disabled",
/* Features */
"sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+
"ui-buttonset-multi paging_", /* Note that the type is postfixed */
/* Sorting */
"sSortAsc": _stateDefault+" sorting_asc",
"sSortDesc": _stateDefault+" sorting_desc",
"sSortable": _stateDefault+" sorting",
"sSortableAsc": _stateDefault+" sorting_asc_disabled",
"sSortableDesc": _stateDefault+" sorting_desc_disabled",
"sSortableNone": _stateDefault+" sorting_disabled",
"sSortJUIAsc": _sortIcon+"triangle-1-n",
"sSortJUIDesc": _sortIcon+"triangle-1-s",
"sSortJUI": _sortIcon+"carat-2-n-s",
"sSortJUIAscAllowed": _sortIcon+"carat-1-n",
"sSortJUIDescAllowed": _sortIcon+"carat-1-s",
"sSortJUIWrapper": "DataTables_sort_wrapper",
"sSortIcon": "DataTables_sort_icon",
/* Scrolling */
"sScrollHead": "dataTables_scrollHead "+_stateDefault,
"sScrollFoot": "dataTables_scrollFoot "+_stateDefault,
/* Misc */
"sHeaderTH": _stateDefault,
"sFooterTH": _stateDefault,
"sJUIHeader": _headerFooter+" ui-corner-tl ui-corner-tr",
"sJUIFooter": _headerFooter+" ui-corner-bl ui-corner-br"
} );
}());
var extPagination = DataTable.ext.pager; var extPagination = DataTable.ext.pager;
function _numbers ( page, pages ) { function _numbers ( page, pages ) {
......
{ {
"_args": [ "_from": "datatables.net@1.10.16",
[ "_id": "datatables.net@1.10.16",
"datatables.net@1.10.15",
"/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte"
]
],
"_from": "datatables.net@1.10.15",
"_id": "datatables.net@1.10.15",
"_inBundle": false, "_inBundle": false,
"_integrity": "sha1-x4kHe7/jhedf9aIz+l8jJRpy32g=", "_integrity": "sha1-SwUtEIKCQmG2ju2dInQbcR09JGk=",
"_location": "/datatables.net", "_location": "/datatables.net",
"_phantomChildren": {}, "_phantomChildren": {},
"_requested": { "_requested": {
"type": "version", "type": "version",
"registry": true, "registry": true,
"raw": "datatables.net@1.10.15", "raw": "datatables.net@1.10.16",
"name": "datatables.net", "name": "datatables.net",
"escapedName": "datatables.net", "escapedName": "datatables.net",
"rawSpec": "1.10.15", "rawSpec": "1.10.16",
"saveSpec": null, "saveSpec": null,
"fetchSpec": "1.10.15" "fetchSpec": "1.10.16"
}, },
"_requiredBy": [ "_requiredBy": [
"/" "#USER",
"/",
"/datatables.net-bs"
], ],
"_resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.15.tgz", "_resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.16.tgz",
"_spec": "1.10.15", "_shasum": "4b052d1082824261b68eed9d22741b711d3d2469",
"_spec": "datatables.net@1.10.16",
"_where": "/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte", "_where": "/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte",
"author": { "author": {
"name": "SpryMedia Ltd", "name": "SpryMedia Ltd",
...@@ -34,9 +31,11 @@ ...@@ -34,9 +31,11 @@
"bugs": { "bugs": {
"url": "https://datatables.net/forums" "url": "https://datatables.net/forums"
}, },
"bundleDependencies": false,
"dependencies": { "dependencies": {
"jquery": ">=1.7" "jquery": ">=1.7"
}, },
"deprecated": false,
"description": "DataTables for jQuery ", "description": "DataTables for jQuery ",
"files": [ "files": [
"js/jquery.dataTables.js" "js/jquery.dataTables.js"
...@@ -57,5 +56,5 @@ ...@@ -57,5 +56,5 @@
"type": "git", "type": "git",
"url": "git+https://github.com/DataTables/Dist-DataTables.git" "url": "git+https://github.com/DataTables/Dist-DataTables.git"
}, },
"version": "1.10.15" "version": "1.10.16"
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -12,22 +12,38 @@ ...@@ -12,22 +12,38 @@
"dependencies": { "dependencies": {
"admin-lte": "~2.3", "admin-lte": "~2.3",
"animate.css": ">=3.4", "animate.css": ">=3.4",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-stage-3": "^6.24.1",
"bootstrap": "~3.3.4", "bootstrap": "~3.3.4",
"clipboard": "~1.5.10", "clipboard": "~1.5.10",
"cross-env": "^5.0.1", "datatables.net": "^1.10.16",
"datatables.net": "~1.10.10", "datatables.net-bs": "^1.10.16",
"datatables.net-bs": "~1.10.10", "element-ui": "^1.4.6",
"font-awesome": ">=4.6", "font-awesome": "^4.7.0",
"form-backend-validation": "^2.0.1",
"gridstack": ">=0.2.2", "gridstack": ">=0.2.2",
"laravel-mix": "^1.0", "icheck": "^1.0.2",
"laravel-mix": "^1.4.5",
"less": "^2.7.2", "less": "^2.7.2",
"less-loader": "^4.0.4", "less-loader": "^4.0.5",
"moment": "^2.18.1",
"simplemde": "~1.9.0", "simplemde": "~1.9.0",
"webpack-shell-plugin": "^0.5.0", "vue-data-tables": "^2.1.0",
"icheck": "^1.0.2", "vue-events": "^3.0.1",
"sisyphus": "0.0.4" "vue-i18n": "^7.3.0",
"vue-router": "^2.7.0",
"vue-shortkey": "^2.2.2",
"vue-simplemde": "^0.4.4",
"webpack-shell-plugin": "^0.5.0"
}, },
"devDependencies": { "devDependencies": {
"cross-env": "^5.0.5" "cross-env": "^5.0.5",
"axios": "^0.16.2",
"bootstrap-sass": "^3.3.7",
"jquery": "^3.1.1",
"laravel-mix": "^1.0",
"lodash": "^4.17.4",
"vue": "^2.1.10"
} }
} }
...@@ -132,7 +132,10 @@ div.dataTables_scrollBody > table > tbody > tr:first-child > td { ...@@ -132,7 +132,10 @@ div.dataTables_scrollBody > table > tbody > tr:first-child > td {
border-top: none; border-top: none;
} }
div.dataTables_scrollFoot > table { div.dataTables_scrollFoot > .dataTables_scrollFootInner {
box-sizing: content-box;
}
div.dataTables_scrollFoot > .dataTables_scrollFootInner > table {
margin-top: 0 !important; margin-top: 0 !important;
border-top: none; border-top: none;
} }
......
{ {
"_args": [ "_from": "datatables.net-bs@1.10.16",
[ "_id": "datatables.net-bs@1.10.16",
"datatables.net-bs@1.10.15",
"/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte"
]
],
"_from": "datatables.net-bs@1.10.15",
"_id": "datatables.net-bs@1.10.15",
"_inBundle": false, "_inBundle": false,
"_integrity": "sha1-ssImEAfYTKW1q/VsGO3CJ+DaGk0=", "_integrity": "sha1-sIVPWzdPcTrj20FWx86op2DD3nY=",
"_location": "/datatables.net-bs", "_location": "/datatables.net-bs",
"_phantomChildren": {}, "_phantomChildren": {},
"_requested": { "_requested": {
"type": "version", "type": "version",
"registry": true, "registry": true,
"raw": "datatables.net-bs@1.10.15", "raw": "datatables.net-bs@1.10.16",
"name": "datatables.net-bs", "name": "datatables.net-bs",
"escapedName": "datatables.net-bs", "escapedName": "datatables.net-bs",
"rawSpec": "1.10.15", "rawSpec": "1.10.16",
"saveSpec": null, "saveSpec": null,
"fetchSpec": "1.10.15" "fetchSpec": "1.10.16"
}, },
"_requiredBy": [ "_requiredBy": [
"#USER",
"/" "/"
], ],
"_resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.10.15.tgz", "_resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.10.16.tgz",
"_spec": "1.10.15", "_shasum": "b0854f5b374f713ae3db4156c7cea8a760c3de76",
"_spec": "datatables.net-bs@1.10.16",
"_where": "/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte", "_where": "/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte",
"author": { "author": {
"name": "SpryMedia Ltd", "name": "SpryMedia Ltd",
...@@ -34,11 +30,13 @@ ...@@ -34,11 +30,13 @@
"bugs": { "bugs": {
"url": "https://datatables.net/forums" "url": "https://datatables.net/forums"
}, },
"bundleDependencies": false,
"dependencies": { "dependencies": {
"datatables.net": ">=1.10.9", "datatables.net": "1.10.16",
"jquery": ">=1.7" "jquery": ">=1.7"
}, },
"description": "DataTables for jQuery with styling for [Bootstrap](http://getbootstrap.com/)", "deprecated": false,
"description": "DataTables for jQuery with styling for [Bootstrap 3](http://getbootstrap.com/)",
"files": [ "files": [
"js/dataTables.bootstrap.js", "js/dataTables.bootstrap.js",
"css/dataTables.bootstrap.css" "css/dataTables.bootstrap.css"
...@@ -60,5 +58,5 @@ ...@@ -60,5 +58,5 @@
"url": "git+https://github.com/DataTables/Dist-DataTables-Bootstrap.git" "url": "git+https://github.com/DataTables/Dist-DataTables-Bootstrap.git"
}, },
"style": "css/dataTables.bootstrap.css", "style": "css/dataTables.bootstrap.css",
"version": "1.10.15" "version": "1.10.16"
} }
/*! DataTables 1.10.15 /*! DataTables 1.10.16
* ©2008-2017 SpryMedia Ltd - datatables.net/license * ©2008-2017 SpryMedia Ltd - datatables.net/license
*/ */
/** /**
* @summary DataTables * @summary DataTables
* @description Paginate, search and order HTML tables * @description Paginate, search and order HTML tables
* @version 1.10.15 * @version 1.10.16
* @file jquery.dataTables.js * @file jquery.dataTables.js
* @author SpryMedia Ltd * @author SpryMedia Ltd
* @contact www.datatables.net * @contact www.datatables.net
...@@ -1023,8 +1023,7 @@ ...@@ -1023,8 +1023,7 @@
[ "iCookieDuration", "iStateDuration" ], // backwards compat [ "iCookieDuration", "iStateDuration" ], // backwards compat
[ "oSearch", "oPreviousSearch" ], [ "oSearch", "oPreviousSearch" ],
[ "aoSearchCols", "aoPreSearchCols" ], [ "aoSearchCols", "aoPreSearchCols" ],
[ "iDisplayLength", "_iDisplayLength" ], [ "iDisplayLength", "_iDisplayLength" ]
[ "bJQueryUI", "bJUI" ]
] ); ] );
_fnMap( oSettings.oScroll, oInit, [ _fnMap( oSettings.oScroll, oInit, [
[ "sScrollX", "sX" ], [ "sScrollX", "sX" ],
...@@ -1054,31 +1053,7 @@ ...@@ -1054,31 +1053,7 @@
var oClasses = oSettings.oClasses; var oClasses = oSettings.oClasses;
// @todo Remove in 1.11 $.extend( oClasses, DataTable.ext.classes, oInit.oClasses );
if ( oInit.bJQueryUI )
{
/* Use the JUI classes object for display. You could clone the oStdClasses object if
* you want to have multiple tables with multiple independent classes
*/
$.extend( oClasses, DataTable.ext.oJUIClasses, oInit.oClasses );
if ( oInit.sDom === defaults.sDom && defaults.sDom === "lfrtip" )
{
/* Set the DOM to use a layout suitable for jQuery UI's theming */
oSettings.sDom = '<"H"lfr>t<"F"ip>';
}
if ( ! oSettings.renderer ) {
oSettings.renderer = 'jqueryui';
}
else if ( $.isPlainObject( oSettings.renderer ) && ! oSettings.renderer.header ) {
oSettings.renderer.header = 'jqueryui';
}
}
else
{
$.extend( oClasses, DataTable.ext.classes, oInit.oClasses );
}
$this.addClass( oClasses.sTable ); $this.addClass( oClasses.sTable );
...@@ -2057,6 +2032,9 @@ ...@@ -2057,6 +2032,9 @@
{ {
oOptions.sClass = oOptions.className; oOptions.sClass = oOptions.className;
} }
if ( oOptions.sClass ) {
th.addClass( oOptions.sClass );
}
$.extend( oCol, oOptions ); $.extend( oCol, oOptions );
_fnMap( oCol, oOptions, "sWidth", "sWidthOrig" ); _fnMap( oCol, oOptions, "sWidth", "sWidthOrig" );
...@@ -4831,7 +4809,12 @@ ...@@ -4831,7 +4809,12 @@
} ); } );
for ( var i=0, ien=lengths.length ; i<ien ; i++ ) { for ( var i=0, ien=lengths.length ; i<ien ; i++ ) {
select[0][ i ] = new Option( language[i], lengths[i] ); select[0][ i ] = new Option(
typeof language[i] === 'number' ?
settings.fnFormatNumber( language[i] ) :
language[i],
lengths[i]
);
} }
var div = $('<div><label/></div>').addClass( classes.sLength ); var div = $('<div><label/></div>').addClass( classes.sLength );
...@@ -8053,6 +8036,11 @@ ...@@ -8053,6 +8036,11 @@
_fnDeleteIndex( settings.aiDisplay, row ); _fnDeleteIndex( settings.aiDisplay, row );
_fnDeleteIndex( that[ thatIdx ], row, false ); // maintain local indexes _fnDeleteIndex( that[ thatIdx ], row, false ); // maintain local indexes
// For server-side processing tables - subtract the deleted row from the count
if ( settings._iRecordsDisplay > 0 ) {
settings._iRecordsDisplay--;
}
// Check for an 'overflow' they case for displaying the table // Check for an 'overflow' they case for displaying the table
_fnLengthOverflow( settings ); _fnLengthOverflow( settings );
...@@ -9327,15 +9315,6 @@ ...@@ -9327,15 +9315,6 @@
classes.sSortableAsc+' '+classes.sSortableDesc+' '+classes.sSortableNone classes.sSortableAsc+' '+classes.sSortableDesc+' '+classes.sSortableNone
); );
if ( settings.bJUI ) {
$('th span.'+classes.sSortIcon+ ', td span.'+classes.sSortIcon, thead).detach();
$('th, td', thead).each( function () {
var wrapper = $('div.'+classes.sSortJUIWrapper, this);
$(this).append( wrapper.contents() );
wrapper.detach();
} );
}
// Add the TR elements back into the table in their original order // Add the TR elements back into the table in their original order
jqTbody.children().detach(); jqTbody.children().detach();
jqTbody.append( rows ); jqTbody.append( rows );
...@@ -9433,7 +9412,7 @@ ...@@ -9433,7 +9412,7 @@
* @type string * @type string
* @default Version number * @default Version number
*/ */
DataTable.version = "1.10.15"; DataTable.version = "1.10.16";
/** /**
* Private data store, containing all of the settings objects that are * Private data store, containing all of the settings objects that are
...@@ -10362,26 +10341,6 @@ ...@@ -10362,26 +10341,6 @@
"bInfo": true, "bInfo": true,
/**
* Enable jQuery UI ThemeRoller support (required as ThemeRoller requires some
* slightly different and additional mark-up from what DataTables has
* traditionally used).
* @type boolean
* @default false
*
* @dtopt Features
* @name DataTable.defaults.jQueryUI
*
* @example
* $(document).ready( function() {
* $('#example').dataTable( {
* "jQueryUI": true
* } );
* } );
*/
"bJQueryUI": false,
/** /**
* Allows the end user to select the size of a formatted page from a select * Allows the end user to select the size of a formatted page from a select
* menu (sizes are 10, 25, 50 and 100). Requires pagination (`paginate`). * menu (sizes are 10, 25, 50 and 100). Requires pagination (`paginate`).
...@@ -13662,14 +13621,6 @@ ...@@ -13662,14 +13621,6 @@
*/ */
"_iRecordsDisplay": 0, "_iRecordsDisplay": 0,
/**
* Flag to indicate if jQuery UI marking and classes should be used.
* Note that this parameter will be set by the initialisation routine. To
* set a default use {@link DataTable.defaults}.
* @type boolean
*/
"bJUI": null,
/** /**
* The classes to use for the table * The classes to use for the table
* @type object * @type object
...@@ -14447,59 +14398,6 @@ ...@@ -14447,59 +14398,6 @@
} ); } );
(function() {
// Reused strings for better compression. Closure compiler appears to have a
// weird edge case where it is trying to expand strings rather than use the
// variable version. This results in about 200 bytes being added, for very
// little preference benefit since it this run on script load only.
var _empty = '';
_empty = '';
var _stateDefault = _empty + 'ui-state-default';
var _sortIcon = _empty + 'css_right ui-icon ui-icon-';
var _headerFooter = _empty + 'fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix';
$.extend( DataTable.ext.oJUIClasses, DataTable.ext.classes, {
/* Full numbers paging buttons */
"sPageButton": "fg-button ui-button "+_stateDefault,
"sPageButtonActive": "ui-state-disabled",
"sPageButtonDisabled": "ui-state-disabled",
/* Features */
"sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+
"ui-buttonset-multi paging_", /* Note that the type is postfixed */
/* Sorting */
"sSortAsc": _stateDefault+" sorting_asc",
"sSortDesc": _stateDefault+" sorting_desc",
"sSortable": _stateDefault+" sorting",
"sSortableAsc": _stateDefault+" sorting_asc_disabled",
"sSortableDesc": _stateDefault+" sorting_desc_disabled",
"sSortableNone": _stateDefault+" sorting_disabled",
"sSortJUIAsc": _sortIcon+"triangle-1-n",
"sSortJUIDesc": _sortIcon+"triangle-1-s",
"sSortJUI": _sortIcon+"carat-2-n-s",
"sSortJUIAscAllowed": _sortIcon+"carat-1-n",
"sSortJUIDescAllowed": _sortIcon+"carat-1-s",
"sSortJUIWrapper": "DataTables_sort_wrapper",
"sSortIcon": "DataTables_sort_icon",
/* Scrolling */
"sScrollHead": "dataTables_scrollHead "+_stateDefault,
"sScrollFoot": "dataTables_scrollFoot "+_stateDefault,
/* Misc */
"sHeaderTH": _stateDefault,
"sFooterTH": _stateDefault,
"sJUIHeader": _headerFooter+" ui-corner-tl ui-corner-tr",
"sJUIFooter": _headerFooter+" ui-corner-bl ui-corner-br"
} );
}());
var extPagination = DataTable.ext.pager; var extPagination = DataTable.ext.pager;
function _numbers ( page, pages ) { function _numbers ( page, pages ) {
......
{ {
"_args": [ "_from": "datatables.net@1.10.16",
[ "_id": "datatables.net@1.10.16",
"datatables.net@1.10.15",
"/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte"
]
],
"_from": "datatables.net@1.10.15",
"_id": "datatables.net@1.10.15",
"_inBundle": false, "_inBundle": false,
"_integrity": "sha1-x4kHe7/jhedf9aIz+l8jJRpy32g=", "_integrity": "sha1-SwUtEIKCQmG2ju2dInQbcR09JGk=",
"_location": "/datatables.net", "_location": "/datatables.net",
"_phantomChildren": {}, "_phantomChildren": {},
"_requested": { "_requested": {
"type": "version", "type": "version",
"registry": true, "registry": true,
"raw": "datatables.net@1.10.15", "raw": "datatables.net@1.10.16",
"name": "datatables.net", "name": "datatables.net",
"escapedName": "datatables.net", "escapedName": "datatables.net",
"rawSpec": "1.10.15", "rawSpec": "1.10.16",
"saveSpec": null, "saveSpec": null,
"fetchSpec": "1.10.15" "fetchSpec": "1.10.16"
}, },
"_requiredBy": [ "_requiredBy": [
"/" "#USER",
"/",
"/datatables.net-bs"
], ],
"_resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.15.tgz", "_resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.16.tgz",
"_spec": "1.10.15", "_shasum": "4b052d1082824261b68eed9d22741b711d3d2469",
"_spec": "datatables.net@1.10.16",
"_where": "/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte", "_where": "/Users/nicolaswidart/Sites/Asguard/Platform/Themes/Adminlte",
"author": { "author": {
"name": "SpryMedia Ltd", "name": "SpryMedia Ltd",
...@@ -34,9 +31,11 @@ ...@@ -34,9 +31,11 @@
"bugs": { "bugs": {
"url": "https://datatables.net/forums" "url": "https://datatables.net/forums"
}, },
"bundleDependencies": false,
"dependencies": { "dependencies": {
"jquery": ">=1.7" "jquery": ">=1.7"
}, },
"deprecated": false,
"description": "DataTables for jQuery ", "description": "DataTables for jQuery ",
"files": [ "files": [
"js/jquery.dataTables.js" "js/jquery.dataTables.js"
...@@ -57,5 +56,5 @@ ...@@ -57,5 +56,5 @@
"type": "git", "type": "git",
"url": "git+https://github.com/DataTables/Dist-DataTables.git" "url": "git+https://github.com/DataTables/Dist-DataTables.git"
}, },
"version": "1.10.15" "version": "1.10.16"
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment