datatables.net 3.0.0-beta.1 → 3.0.0-beta.2

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 3.0.0-beta.1
+/*! DataTables 3.0.0-beta.2
  * Copyright (c) SpryMedia Ltd - datatables.net/license
  */
 
@@ -46,9 +46,11 @@ const reRegexCharacters = new RegExp('(\\' +
 // implementations differ between browsers.
 const reDate = /^\d{2,4}[./-]\d{1,2}[./-]\d{1,2}([T ]{1}\d{1,2}[:.]\d{2}([.:]\d{2})?)?$/;
 const reNewLines = /[\r\n\u2028]/g;
+const isoTimezone = /[T\s]\d{2}.*?(Z|[+-]\d{2}(?::?\d{2})?)$/;
 
 var regex = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    isoTimezone: isoTimezone,
     reDate: reDate,
     reFormattedNumeric: reFormattedNumeric,
     reHtml: reHtml,
@@ -520,6 +522,13 @@ function ajax(optionsIn) {
     if (options.contentType && !(options.data instanceof FormData)) {
         xhr.setRequestHeader('Content-Type', options.contentType);
     }
+    // Add a X-Request-With header, as jQuery does so and some server-side
+    // platforms look for it. Only for same domain though.
+    if (options.headers &&
+        !options.headers['X-Requested-With'] &&
+        !isCrossDomain(options.url)) {
+        options.headers['X-Requested-With'] = 'XMLHttpRequest';
+    }
     each(options.headers, (key, val) => {
         xhr.setRequestHeader(key, val);
     });
@@ -617,6 +626,17 @@ function convertSpaces(sendData, options) {
         ? sendData.replace(/%20/g, '+')
         : sendData;
 }
+/**
+ * Determine if a url is a cross domain request or not
+ *
+ * @param url URL to check
+ * @returns True if cross domain, false otherwise
+ */
+function isCrossDomain(url) {
+    // Use the current page as the base to handle relative URLs correctly
+    const target = new URL(url, window.location.origin);
+    return target.origin !== window.location.origin;
+}
 /**
  * Get the HTTP method from the Ajax request options
  *
@@ -1872,8 +1892,7 @@ class Dom {
             }
         }
         if (sort) {
-            Array.prototype.sort.call(this, documentOrder);
-            // this.sort(documentOrder);
+            this.sort();
         }
         return this;
     }
@@ -2664,6 +2683,18 @@ class Dom {
             el.style.display = 'block';
         });
     }
+    /**
+     * Sort the DOM elements into document order.
+     *
+     * This is normally not needed as elements selected with a DOM selector are
+     * automatically sorted in document order. However, in the case of elements
+     * being added as an array, their order will be retained. In such as case
+     * you might wish to sort them in document order.
+     */
+    sort() {
+        Array.prototype.sort.call(this, documentOrder);
+        return this;
+    }
     text(txt) {
         if (txt === undefined) {
             return this.count() ? this[0].textContent : null;
@@ -3824,7 +3855,7 @@ const ext = {
      * Software version
      *  @type string
      */
-    version: '3.0.0-beta.1'
+    version: '3.0.0-beta.2'
 };
 //
 // Backwards compatibility. Alias to pre 1.10 Hungarian notation counter parts
@@ -4117,7 +4148,7 @@ function __mldObj(d, format, locale) {
     var dt;
     resolveWindowLibs();
     if (__moment) {
-        dt = __moment.utc(d, format, locale, true);
+        dt = __moment(d, format, locale, true);
         if (!dt.isValid()) {
             return null;
         }
@@ -4220,6 +4251,15 @@ function __mlHelper(localeString) {
                 !(d instanceof Date)) {
                 return d;
             }
+            // Determine if there is a timezone. If there is, we want to reuse
+            // it for the output, so the timezone doesn't change between the
+            // input and output.
+            let options = {};
+            let tzMatch = typeof d === 'string' ? d.match(util.regex.isoTimezone) : null;
+            if (tzMatch) {
+                options.timeZone = tzMatch[1] === 'Z' ? 'UTC' : tzMatch[1];
+            }
+            // Get a Date object (Luxon, moment or Date)
             var dt = __mldObj(d, from, locale);
             if (dt === null) {
                 return d;
@@ -4228,7 +4268,7 @@ function __mlHelper(localeString) {
                 return dt;
             }
             var formatted = to === null
-                ? __mld(dt, 'toDate', 'toJSDate', '')[localeString](navigator.language, { timeZone: 'UTC' })
+                ? __mld(dt, 'toDate', 'toJSDate', '')[localeString](navigator.language, options)
                 : __mld(dt, 'format', 'toFormat', 'toISOString', to);
             // XSS protection
             return type === 'display' ? util.escapeHtml(formatted) : formatted;
@@ -5384,8 +5424,8 @@ function featureTable(settings) {
     let captionSide = caption
         ? caption._captionSide
         : null;
-    let headerClone = table.clone(false);
-    let footerClone = table.clone(false);
+    let tableCloneHeader = table.clone(false);
+    let tableCloneFooter = table.clone(false);
     let footer = table.children('tfoot');
     let size = function (s) {
         return !s ? '100%' : stringToCss(s);
@@ -5406,11 +5446,10 @@ function featureTable(settings) {
      *        table - scroll foot table
      *          tfoot - tfoot
      */
-    let scroller = Dom
-        .c('div')
+    let scroller = Dom.c('div')
         .classAdd(classes.container)
-        .append(Dom
-        .c('div')
+        .attr('role', 'table')
+        .append(Dom.c('div')
         .classAdd(classes.header.self)
         .css({
         overflow: 'hidden',
@@ -5418,40 +5457,41 @@ function featureTable(settings) {
         border: '0',
         width: scrollX ? size(scrollX) : '100%'
     })
-        .append(Dom
-        .c('div')
+        .attr('role', 'none')
+        .append(Dom.c('div')
         .classAdd(classes.header.inner)
         .css({
         'box-sizing': 'content-box',
         width: scroll.xInner || '100%'
     })
-        .append(headerClone
+        .attr('role', 'none')
+        .append(tableCloneHeader
         .attrRemove('id')
         .css('margin-left', '0')
         .append(captionSide === 'top' ? caption : null)
         .append(table.children('thead')))))
-        .append(Dom
-        .c('div')
+        .append(Dom.c('div')
         .classAdd(classes.body)
         .css({
         position: 'relative',
         overflow: 'auto',
         width: size(scrollX)
     })
+        .attr('role', 'none')
         .append(table));
     if (footer.count()) {
-        scroller.append(Dom
-            .c('div')
+        scroller.append(Dom.c('div')
             .classAdd(classes.footer.self)
             .css({
             overflow: 'hidden',
             border: '0',
             width: scrollX ? size(scrollX) : '100%'
         })
-            .append(Dom
-            .c('div')
+            .attr('role', 'none')
+            .append(Dom.c('div')
             .classAdd(classes.footer.inner)
-            .append(footerClone
+            .attr('role', 'none')
+            .append(tableCloneFooter
             .attrRemove('id')
             .css('margin-left', '0')
             .append(captionSide === 'bottom' ? caption : null)
@@ -5489,6 +5529,22 @@ function featureTable(settings) {
     settings.scrollFoot = scrollFoot;
     // On redraw - align columns
     settings.callbacks.draw.push(scrollDraw);
+    // Aria roles - because we break the table up into parts we need to be very
+    // explicit with the roles to create the accessability tree for the table,
+    // otherwise browser's attempt to "fix" the tree by filling in what it
+    // thinks are gaps. The static elements that we can assign roles to are done
+    // here. Dynamic ones are done in the draw function below.
+    table.attr('role', 'none');
+    table.find('tbody').attr('role', 'rowgroup');
+    tableCloneHeader.attr('role', 'none');
+    tableCloneFooter.attr('role', 'none');
+    settings.colgroup.find('colgroup').attr('role', 'none');
+    // Move the info feature's aria desc by to the new "table"
+    let describedBy = table.attr('aria-describedby');
+    if (describedBy) {
+        scroller.attr('aria-describedby', describedBy);
+        table.attrRemove('aria-describedby');
+    }
     return scroller.get(0);
 }
 /**
@@ -5521,10 +5577,13 @@ function scrollDraw(settings) {
     else {
         settings.scrollBarVis = scrollBarVis;
     }
+    header.find('thead').attr('role', 'rowgroup');
+    footer.find('tfoot').attr('role', 'rowgroup');
     // 1. Re-create the table inside the scrolling div
     // Remove the old minimised thead and tfoot elements in the inner table
     table.children('thead, tfoot').remove();
-    // Clone the current header and footer elements and then place it into the inner table
+    // Clone the current header and footer elements and then place it into the
+    // inner table
     headerCopy = header.clone(true).prependTo(table);
     headerCopy.find('th, td').attrRemove('tabindex');
     headerCopy.find('[id]').attrRemove('id');
@@ -5559,8 +5618,7 @@ function scrollDraw(settings) {
             }
         }
         if (firstTr) {
-            let colSizes = Dom
-                .s(firstTr)
+            let colSizes = Dom.s(firstTr)
                 .children('th, td')
                 .mapTo(function (cell, idx) {
                 return {
@@ -5625,6 +5683,18 @@ function scrollDraw(settings) {
     }
     // Correct DOM ordering for colgroup - comes before the thead
     table.children('colgroup').prependTo(table);
+    // Remove tabindex from the hidden row elements
+    table.find('thead, tfoot').find('[tabindex]').attrRemove('tabindex');
+    // Dynamic ARIA roles - see setup for details on why this is needed
+    table
+        .find('thead, tfoot')
+        .attr('role', 'none')
+        .find('[role]')
+        .attrRemove('role');
+    table.find('tbody tr:not([role])').attr('role', 'row');
+    table.find('tbody td:not([role]), tbody th:not([role])').attr('role', 'cell');
+    scrollAria(headerCopy);
+    scrollAria(footerCopy);
     // Adjust the position of the header in case we loose the y-scrollbar
     divBody.trigger('scroll');
     // If sorting or filtering has occurred, jump the scrolling back to the top
@@ -5633,6 +5703,18 @@ function scrollDraw(settings) {
         divBodyEl.scrollTop(0);
     }
 }
+/**
+ * Apply ARIA roles for the header / footer of a scrolling table
+ * @param element
+ */
+function scrollAria(element) {
+    if (element) {
+        element.find('tfoot:not([role])').attr('role', 'rowgroup');
+        element.find('tr:not([role])').attr('role', 'row');
+        element.find('th:not([role])').attr('role', 'columnheader');
+        element.find('td:not([role])').attr('role', 'cell');
+    }
+}
 
 /**
  * Add a column to the list used for the table with default values
@@ -8297,6 +8379,11 @@ function reDraw(settings, holdPosition, recompute) {
     if (holdPosition !== true) {
         settings.displayStart = 0;
     }
+    else {
+        // Keep position, but make sure that there is actually data to display,
+        // otherwise we need to rewind a bit (e.g. if rows were deleted)
+        lengthOverflow(settings);
+    }
     // Let any modules know about the draw hold position state (used by
     // scrolling internally)
     settings.drawHold = holdPosition;

package/package.json

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