datatables.net 3.0.0 → 3.0.2

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables
+/*! DataTables 3.0.2
  * Copyright (c) SpryMedia Ltd - datatables.net/license
  */
 
@@ -118,7 +118,7 @@ let _stripHtml = function (input, replacement = '') {
  * This function is replaceable if the user wishes to use a different library
  * for escaping HTML entities in a string.
  *
- * @param d Value to escape HTML in
+ * @param val Value to escape HTML in
  * @returns Escaped value
  */
 let _escapeHtml = function (val) {
@@ -517,7 +517,10 @@ function ajax(optionsIn) {
             options.contentType = 'application/json; charset=utf-8';
         }
     }
-    xhr.open(method, options.url + (options.url.includes('?') ? '&' : '?') + urlParams, true, options.username || null, options.password || null);
+    xhr.open(method, options.url +
+        (urlParams
+            ? (options.url.includes('?') ? '&' : '?') + urlParams
+            : ''), true, options.username || null, options.password || null);
     // Content type for FormData requests gets set by the browser.
     if (options.contentType && !(options.data instanceof FormData)) {
         xhr.setRequestHeader('Content-Type', options.contentType);
@@ -607,7 +610,9 @@ ajax.serialize = serialize;
  * Run callback functions (allowing for none, one or array)
  *
  * @param fnIn Function(s) to run
- * @param parameters Parameters to pass to the function(s)
+ * @param arg1 Parameters to pass to the function(s)
+ * @param arg2 Parameters to pass to the function(s)
+ * @param arg3 Parameters to pass to the function(s)
  */
 function callback(fnIn, arg1, arg2, arg3) {
     if (!fnIn) {
@@ -827,6 +832,7 @@ function pluck(a, prop, prop2) {
  * as the indexes to pick from the source array
  *
  * @param a Array to get values from
+ * @param order Indexes to pick
  * @param prop Property to read values from
  * @param prop2 Inner property to get values from if a 2D array
  * @returns Array of read values
@@ -1885,7 +1891,7 @@ class Dom {
     /**
      * Add an element (or multiple) to the instance. Will ensure uniqueness.
      *
-     * @param el Element(s) to add
+     * @param selector Element(s) to add
      * @param sort Indicate if the element should be added in document order.
      * @returns Self for chaining
      */
@@ -2286,7 +2292,7 @@ class Dom {
     /**
      * Get all matching descendants
      *
-     * @param selector Elements to find
+     * @param input Elements to find
      * @returns A new Dom instance with all matching elements
      */
     find(input) {
@@ -3015,6 +3021,7 @@ const legacy = [];
  * @param name The name of the new feature.
  * @param cb A function that will create the elements and event listeners for
  * the feature being added.
+ * @param legacyChar
  */
 function register$2(name, cb, legacyChar = '') {
     features[name] = cb;
@@ -3879,7 +3886,7 @@ const ext = {
      * Software version
      *  @type string
      */
-    version: '3.0.0'
+    version: '3.0.2'
 };
 //
 // Backwards compatibility. Alias to pre 1.10 Hungarian notation counter parts
@@ -4784,7 +4791,7 @@ function create$1(parts = {}) {
  * DOM source.
  *
  * @param settings DataTables settings object
- * @param data data array to be added
+ * @param dataIn data array to be added
  * @param tr TR element to add to the table - optional. If not given, DataTables
  *   will create a row automatically
  * @param tds Array of TD|TH elements for the row - must be given if tr is.
@@ -4823,7 +4830,7 @@ function addData(settings, dataIn, tr, tds) {
  * it is not cloned).
  *
  * @param settings DataTables settings object
- * @param trs The TR element(s) to add to the table
+ * @param rows The TR element(s) to add to the table
  * @returns Array of indexes for the added rows
  */
 function addTr(settings, rows) {
@@ -4971,7 +4978,7 @@ function clearTable(settings) {
  * @param colIdx Column index to invalidate. If undefined the whole row will be
  *    invalidated
  */
-function invalidate(settings, rowIdx, src, colIdx) {
+function invalidateRow(settings, rowIdx, src, colIdx) {
     var row = settings.data[rowIdx];
     var i, iLen;
     if (!row) {
@@ -5001,6 +5008,18 @@ function invalidate(settings, rowIdx, src, colIdx) {
             }
         }
     }
+    invalidColumn(settings, colIdx);
+    // Update DataTables special `DT_*` attributes for the row
+    rowAttributes(settings, row);
+    callbackFire(settings, null, 'rowInvalidate', [settings, rowIdx, colIdx], false);
+}
+/**
+ * Column specific invalidation
+ *
+ * @param settings DataTables settings object
+ * @param colIdx Column index to invalidate, or all columns if not given
+ */
+function invalidColumn(settings, colIdx) {
     // Column specific invalidation
     var cols = settings.columns;
     if (colIdx !== undefined) {
@@ -5011,14 +5030,12 @@ function invalidate(settings, rowIdx, src, colIdx) {
         cols[colIdx].wideStrings = null;
     }
     else {
-        for (i = 0, iLen = cols.length; i < iLen; i++) {
+        for (let i = 0, iLen = cols.length; i < iLen; i++) {
             cols[i].type = null;
             cols[i].wideStrings = null;
         }
-        // Update DataTables special `DT_*` attributes for the row
-        rowAttributes(settings, row);
     }
-    callbackFire(settings, null, 'rowInvalidate', [settings, rowIdx, colIdx], false);
+    settings.containerWidth = -1;
 }
 /**
  * Get the cells and data for a given row - from a <tr> element
@@ -5107,10 +5124,21 @@ function readCellData(settings, cell, data, colIdx) {
     }
 }
 
+/**
+ * Recalculate the column widths, if needed (by a column having been
+ * invalidated)
+ *
+ * @param settings DataTables settings object
+ */
+function columnWidths(settings) {
+    if (settings.columns.map(c => c.wideStrings).includes(null)) {
+        calculateColumnWidths(settings);
+    }
+}
 /**
  * Calculate the width of columns for the table
  *
- * @param settings dataTables settings object
+ * @param settings DataTables settings object
  */
 function calculateColumnWidths(settings) {
     // Not interested in doing column width calculation if auto-width is disabled
@@ -5405,7 +5433,7 @@ function getWideStrings(settings, colIdx) {
 /**
  * Append a CSS unit (only if required) to a string
  *
- * @param value to css-ify
+ * @param s Value to css-ify
  * @returns Value with css unit
  */
 function stringToCss(s) {
@@ -5658,12 +5686,9 @@ function scrollDraw(settings) {
             // Check against what the colgroup > col is set to and correct if needed
             for (let i = 0; i < colSizes.length; i++) {
                 let colEl = settings.columns[colSizes[i].idx].colEl;
-                let colWidth = colEl.width();
-                if (colWidth !== colSizes[i].width) {
-                    colEl.css('width', colSizes[i].width + 'px');
-                    if (scroll.x) {
-                        colEl.css('minWidth', colSizes[i].width + 'px');
-                    }
+                colEl.css('width', colSizes[i].width + 'px');
+                if (scroll.x) {
+                    colEl.css('minWidth', colSizes[i].width + 'px');
                 }
             }
         }
@@ -5961,13 +5986,15 @@ function _typeResult(typeDetect, res) {
  * Calculate the 'type' of a column
  * @param settings DataTables settings object
  */
-function columnTypes(settings) {
+function columnTypes(settings, originalTypes = '') {
     var columns = settings.columns;
     var data = settings.data;
     var types = ext.type.detect;
     var i, iLen, j, jen, k, ken;
     var col, detectedType, cache;
-    var originalTypes = columns.map(c => c.type).join(',');
+    if (!originalTypes) {
+        originalTypes = columns.map(c => c.type).join(',');
+    }
     // For each column, spin over the data type detection functions, seeing if
     // one matches
     for (i = 0, iLen = columns.length; i < iLen; i++) {
@@ -6339,7 +6366,7 @@ function renderer(ctx, type) {
 /**
  * Add the options to the page HTML for the table
  *
- * @param settings DataTables settings object
+ * @param ctx DataTables context
  */
 function createLayout(ctx) {
     var classes = ctx.classes;
@@ -6716,6 +6743,7 @@ function sortAttachListener(settings, node, selector, column, callback) {
  * Sort the display array to match the master's order
  *
  * @param settings DataTables context
+ * @param display The display array
  */
 function sortDisplay(settings, display) {
     if (display.length < 2) {
@@ -6943,7 +6971,6 @@ function sort(ctx, col, dir) {
  * Function to run on user sort request
  *
  * @param settings dataTables settings object
- * @param attachTo node to attach the handler to
  * @param colIdx column sorting index
  * @param addIndex Counter
  * @param shift Shift click add
@@ -7666,6 +7693,7 @@ function ajaxUpdateDraw(settings, json) {
     var drawUnique = ajaxDataSrcParam(settings, 'draw', json);
     var recordsTotal = ajaxDataSrcParam(settings, 'recordsTotal', json);
     var recordsFiltered = ajaxDataSrcParam(settings, 'recordsFiltered', json);
+    var existingTypes = settings.columns.map(c => c.type).join(',');
     if (drawUnique !== undefined) {
         // Protect against out of sequence returns
         if (drawUnique * 1 < settings.drawCount) {
@@ -7685,7 +7713,7 @@ function ajaxUpdateDraw(settings, json) {
         addData(settings, data[i]);
     }
     settings.display = settings.displayMaster.slice();
-    columnTypes(settings);
+    columnTypes(settings, existingTypes);
     draw(settings, true);
     initComplete(settings);
     processingDisplay(settings, false);
@@ -7760,7 +7788,6 @@ const __filter_div_textContent = __filter_div.textContent !== undefined;
  * Filter the table using both the global filter and column based filtering
  *
  * @param settings DataTables settings object
- * @param input search information
  */
 function filterComplete(settings) {
     settings.columns;
@@ -7824,7 +7851,6 @@ function filterCustom(settings) {
  * @param settings
  * @param input
  * @param options
- * @param column
  * @returns
  */
 function filter(searchRows, settings, input, options) {
@@ -8399,6 +8425,7 @@ function reDraw(settings, holdPosition, recompute) {
         // Resolve any column types that are unknown due to addition or
         // invalidation
         columnTypes(settings);
+        columnWidths(settings);
         if (doSort) {
             sort(settings);
         }
@@ -9177,7 +9204,7 @@ function getPrototypeNames(name) {
  * Each of the input parameter types will be converted to a DataTables settings
  * object where possible.
  *
- * @param mixed DataTable identifier. Can be one of:
+ * @param mixedIn DataTable identifier. Can be one of:
  *   * `string` - jQuery selector. Any DataTables' matching the given selector
  *     with be found and used.
  *   * `node` - `TABLE` node which has already been formed into a DataTable.
@@ -9466,7 +9493,7 @@ const __reload = function (settings, holdPosition, callback) {
         processingDisplay(settings, true);
         // Cancel an existing request
         var xhr = settings.jqXHR;
-        if (xhr && xhr.readyState !== 4) {
+        if (xhr && xhr.readyState !== 4 && typeof xhr.abort === 'function') {
             xhr.abort();
         }
         // Trigger xhr
@@ -9715,7 +9742,7 @@ registerPlural('cells().indexes()', 'cell().index()', function () {
 });
 registerPlural('cells().invalidate()', 'cell().invalidate()', function (src) {
     return this.iterator('cell', function (settings, row, column) {
-        invalidate(settings, row, src, column);
+        invalidateRow(settings, row, src, column);
     });
 });
 register('cell()', function (rowSelector, columnSelector, opts) {
@@ -9732,7 +9759,7 @@ register('cell().data()', function (data) {
     }
     // Set
     setCellData(ctx[0], cell[0].row, cell[0].column, data);
-    invalidate(ctx[0], cell[0].row, 'data', cell[0].column);
+    invalidateRow(ctx[0], cell[0].row, 'data', cell[0].column);
     return this;
 });
 
@@ -9748,7 +9775,7 @@ register('cell().data()', function (data) {
  */
 // can be an array of these items, comma separated list, or an array of comma
 // separated lists
-const __re_column_selector = /^([^:]+)?:(name|title|visIdx|visible)$/;
+const __re_column_selector = /^(.*?):(name|title|visIdx|visible)$/;
 // r1 and r2 are redundant - but it means that the parameters match for the
 // iterator callback in columns().data()
 function columnData(settings, column, r1, r2, rows, type) {
@@ -10243,7 +10270,7 @@ registerPlural('columns().orderable()', 'column().orderable()', function (direct
 /**
  * Set the page length
  *
- * @param settings DataTables context
+ * @param ctx DataTables context
  * @param val Value to change to
  */
 function lengthChange(ctx, val) {
@@ -10684,7 +10711,7 @@ register('rows().data()', function () {
 });
 registerPlural('rows().invalidate()', 'row().invalidate()', function (src) {
     return this.iterator('row', function (settings, row) {
-        invalidate(settings, row, src);
+        invalidateRow(settings, row, src);
     });
 });
 registerPlural('rows().indexes()', 'row().index()', function () {
@@ -10771,7 +10798,7 @@ register('row().data()', function (data) {
         util.set(ctx[0].rowId)(data, row.tr.id);
     }
     // Automatically invalidate
-    invalidate(ctx[0], this[0][0], 'data');
+    invalidateRow(ctx[0], this[0][0], 'data');
     return this;
 });
 register('row().node()', function () {
@@ -10785,12 +10812,15 @@ register('row().node()', function () {
     return null;
 });
 register('row.add()', function (row) {
-    // Allow a jQuery object to be passed in - only a single row is added from
-    // it though - the first element in the set
+    // Allow an array-like object to be passed in - only a single row is added
+    // from it though - the first element in the set
     if (row && row.fn && row.length) {
         row = row[0];
     }
     var rows = this.iterator('table', function (settings) {
+        // New column could cause a change in the cached column properties such
+        // as type and width.
+        invalidColumn(settings);
         if (row.nodeName && row.nodeName.toUpperCase() === 'TR') {
             return addTr(settings, Dom.s(row))[0];
         }
@@ -11151,7 +11181,11 @@ function b64ToBuf(b64) {
  */
 function check(releaseDate, software) {
     let expires = _licenseInfo.expires;
-    if (_licenseInfo.valid === false) {
+    if (!getSubtle()) {
+        noticePrep('Unable to validate license key');
+        noticeDisplay();
+    }
+    else if (_licenseInfo.valid === false) {
         noticePrep('License key invalid');
         noticeDisplay();
     }
@@ -11177,7 +11211,14 @@ function check(releaseDate, software) {
             return true;
         }
     }
-    else if (_licenseInfo.type === 'plus' ||
+    else if (software === null) {
+        // Validating the key only - there hasn't been any specific software
+        // calling the `plus` parameter yet. The key is good, so carry on.
+        return true;
+    }
+    else if (
+    // Checking if the build version can be used with this key
+    _licenseInfo.type === 'plus' ||
         (_licenseInfo.type === 'editor' && software === 'editor')) {
         if (!expires || new Date(releaseDate) > expires) {
             noticePrep('Upgrade required for this version');
@@ -11187,6 +11228,7 @@ function check(releaseDate, software) {
         return true;
     }
     else if (_licenseInfo.type === 'editor' && software !== 'editor') {
+        // Editor specific license
         noticePrep('License for Editor only. Upgrade for Plus');
         noticeDisplay();
         return false;
@@ -11270,7 +11312,7 @@ function noticePrep(text) {
  * Display the license notice
  */
 function noticeDisplay() {
-    if (!_processingKey && !document.body.contains(_wm[0])) {
+    if (!_processingKey && document.body && !document.body.contains(_wm[0])) {
         document.body.appendChild(_wm[0]);
     }
 }
@@ -11292,36 +11334,33 @@ function verify(licenseString) {
             }
             var payload = parts[0];
             var signatureB64 = parts[1];
-            // Backwards compat for old browsers
-            var cryptoObj = window.crypto || window.msCrypto;
-            var subtle = cryptoObj.subtle || cryptoObj.webkitSubtle;
+            // Extract the payload to be useful
+            var payloadParts = payload.match(/(plus|trial|editor)_(\d+)_(\d{4})(\d{2})(\d{2})/);
+            if (!payloadParts || payloadParts.length !== 6) {
+                _licenseInfo.valid = false;
+                return resolve();
+            }
+            _licenseInfo.type = payloadParts[1];
+            _licenseInfo.developers = parseInt(payloadParts[2]);
+            _licenseInfo.expires = new Date(payloadParts[3] + '-' + payloadParts[4] + '-' + payloadParts[5]);
+            var subtle = getSubtle();
             var rawKey = b64ToBuf(_publicKey);
             var rawSig = b64ToBuf(signatureB64);
             var data = new TextEncoder().encode(payload);
+            // Non-secure environments don't have cryptographic verification
+            // available.
+            if (!subtle) {
+                _licenseInfo.valid = false;
+                resolve();
+                return;
+            }
             subtle
                 .importKey('raw', rawKey, { name: 'ECDSA', namedCurve: 'P-256' }, false, ['verify'])
                 .then(function (key) {
                 return subtle.verify({ name: 'ECDSA', hash: { name: 'SHA-256' } }, key, rawSig, data);
             })
                 .then(function (isValid) {
-                if (!isValid) {
-                    _licenseInfo.valid = false;
-                    return resolve();
-                }
-                // Extract the payload to be useful
-                var payloadParts = payload.match(/(plus|trial|editor)_(\d+)_(\d{4})(\d{2})(\d{2})/);
-                if (!payloadParts || payloadParts.length !== 6) {
-                    _licenseInfo.valid = false;
-                    return resolve();
-                }
-                _licenseInfo.valid = true;
-                _licenseInfo.type = payloadParts[1];
-                _licenseInfo.developers = parseInt(payloadParts[2]);
-                _licenseInfo.expires = new Date(payloadParts[3] +
-                    '-' +
-                    payloadParts[4] +
-                    '-' +
-                    payloadParts[5]);
+                _licenseInfo.valid = isValid;
                 resolve();
             })
                 .catch(function () {
@@ -11345,7 +11384,7 @@ function verify(licenseString) {
  */
 function plus (DataTable) {
     Object.defineProperty(DataTable, 'plus', {
-        value: function (releaseDate, software = null) {
+        value: function (releaseDate, software = '') {
             // Unsecure sites are only useful for development, so allow there
             // and on the site.
             let host = window.location.hostname;
@@ -11370,6 +11409,12 @@ function plus (DataTable) {
         writable: false
     });
 }
+function getSubtle() {
+    // Backwards compat for old browsers
+    let cryptoObj = window.crypto || window.msCrypto;
+    let subtle = cryptoObj.subtle || cryptoObj.webkitSubtle;
+    return subtle;
+}
 
 /**
  * CommonJS factory function pass through. This will check if the arguments
@@ -11496,6 +11541,8 @@ register$2('info', function (settings, optsIn) {
 /**
  * Update the information elements in the display
  *  @param settings DataTables settings object
+ *  @param opts
+ *  @param node
  */
 function updateInfo(settings, opts, node) {
     var start = settings.displayStart + 1, end = displayEnd(settings), max = recordsTotal(settings), total = recordsDisplay(settings), out = total ? opts.text : opts.empty;
@@ -11568,7 +11615,7 @@ function _pagingDraw(settings, host, opts) {
     if (!settings.initDone) {
         return;
     }
-    let plugin = opts.type ? ext.pager[opts.type] : _pagingDynamic, aria = settings.language.aria.paginate || {}, start = settings.displayStart, len = settings.pageLength, visRecords = recordsDisplay(settings), all = len === -1, page = all ? 0 : Math.ceil(start / len), pages = Math.ceil(visRecords / (all ? 1 : len)), buttons = [], buttonEls = [], buttonsNested = plugin(opts).map(function (val) {
+    let plugin = opts.type ? ext.pager[opts.type] : _pagingDynamic, aria = settings.language.aria.paginate || {}, start = settings.displayStart, len = settings.pageLength, visRecords = recordsDisplay(settings), all = len === -1, page = all ? 0 : Math.ceil(start / len), pages = all ? (visRecords ? 1 : 0) : Math.ceil(visRecords / len), buttons = [], buttonEls = [], buttonsNested = plugin(opts).map(function (val) {
         return val === 'numbers'
             ? pagingNumbers(page, pages, opts.buttons, opts.boundaryNumbers)
             : val;
@@ -12237,7 +12284,8 @@ const defaults = {
     },
     stateSaveParams: null,
     tabIndex: 0,
-    titleRow: null
+    titleRow: null,
+    typeDetect: true
 };
 
 const DataTable = function (selector, options) {

package/package.json

@@ -4,7 +4,7 @@
     "main": "js/dataTables.js",
     "module": "js/dataTables.mjs",
     "types": "./types/types.d.ts",
-    "version": "3.0.0",
+    "version": "3.0.2",
     "files": [
         "js/**/*.js",
         "js/**/*.mjs",