removed tablesort, corrected lib_css, updated tablesorter reference

lib/autoload.inc

@@ -3,7 +3,6 @@
 require_once dirname(__FILE__).'/system/autoload.inc';
 require_once dirname(__FILE__).'/markdown/autoload.inc';
 require_once dirname(__FILE__).'/jquery/autoload.inc';
-require_once dirname(__FILE__).'/tablesort/autoload.inc';
 require_once dirname(__FILE__).'/tablesorter/autoload.inc';
 require_once dirname(__FILE__).'/bootstrap/autoload.inc';
 require_once dirname(__FILE__).'/tinymce/autoload.inc';

lib/lib_css.php

@@ -1,5 +1,5 @@
 <?php
 namespace LIB;
 abstract class lib_css extends lib{
-    protected static abstract function css_path(); //css webpath
+    protected static function css_path(){} //css webpath
 }

lib/tablesort/autoload.inc

@@ -1,5 +0,0 @@
-<?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'LIB');
-\LIB\lib_controll::register('\LIB\lib_tablesort');
-\LIB\lib_controll::register('\LIB\lib_tablesort_numeric');
-\LIB\lib_controll::register('\LIB\lib_tablesort_date');

lib/tablesort/lib/tablesort.date.js

@@ -1,23 +0,0 @@
-// Basic dates in dd/mm/yy or dd-mm-yy format.
-// Years can be 4 digits. Days and Months can be 1 or 2 digits.
-(function(){
-  var parseDate = function(date) {
-    date = date.replace(/\-/g, '/');
-    date = date.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, '$1/$2/$3'); // format before getTime
-
-    return new Date(date).getTime() || -1;
-  };
-
-  Tablesort.extend('date', function(item) {
-    return (
-      item.search(/(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\.?\,?\s*/i) !== -1 ||
-      item.search(/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/) !== -1 ||
-      item.search(/(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/i) !== -1
-    ) && !isNaN(parseDate(item));
-  }, function(a, b) {
-    a = a.toLowerCase();
-    b = b.toLowerCase();
-
-    return parseDate(b) - parseDate(a);
-  });
-}());

lib/tablesort/lib/tablesort.js

@@ -1,246 +0,0 @@
-;(function() {
-  function Tablesort(el, options) {
-    if (!el || el.tagName !== 'TABLE') {
-      throw new Error('Element must be a table');
-    }
-    this.init(el, options || {});
-  }
-
-  var sortOptions = [];
-
-  var createEvent = function(name) {
-    var evt;
-
-    if (!window.CustomEvent || typeof window.CustomEvent !== 'function') {
-      evt = document.createEvent('CustomEvent');
-      evt.initCustomEvent(name, false, false, undefined);
-    } else {
-      evt = new CustomEvent(name);
-    }
-
-    return evt;
-  };
-
-  var getInnerText = function(el) {
-    return el.getAttribute('data-sort') || el.textContent || el.innerText || '';
-  };
-
-  // Default sort method if no better sort method is found
-  var caseInsensitiveSort = function(a, b) {
-    a = a.toLowerCase();
-    b = b.toLowerCase();
-
-    if (a === b) return 0;
-    if (a < b) return 1;
-
-    return -1;
-  };
-
-  // Stable sort function
-  // If two elements are equal under the original sort function,
-  // then there relative order is reversed
-  var stabilize = function(sort, antiStabilize) {
-    return function(a, b) {
-      var unstableResult = sort(a.td, b.td);
-
-      if (unstableResult === 0) {
-        if (antiStabilize) return b.index - a.index;
-        return a.index - b.index;
-      }
-
-      return unstableResult;
-    };
-  };
-
-  Tablesort.extend = function(name, pattern, sort) {
-    if (typeof pattern !== 'function' || typeof sort !== 'function') {
-      throw new Error('Pattern and sort must be a function');
-    }
-
-    sortOptions.push({
-      name: name,
-      pattern: pattern,
-      sort: sort
-    });
-  };
-
-  Tablesort.prototype = {
-
-    init: function(el, options) {
-      var that = this,
-          firstRow,
-          defaultSort,
-          i,
-          cell;
-
-      that.table = el;
-      that.thead = false;
-      that.options = options;
-
-      if (el.rows && el.rows.length > 0) {
-        if (el.tHead && el.tHead.rows.length > 0) {
-          firstRow = el.tHead.rows[el.tHead.rows.length - 1];
-          that.thead = true;
-        } else {
-          firstRow = el.rows[0];
-        }
-      }
-
-      if (!firstRow) return;
-
-      var onClick = function() {
-        if (that.current && that.current !== this) {
-          that.current.classList.remove('sort-up');
-          that.current.classList.remove('sort-down');
-        }
-
-        that.current = this;
-        that.sortTable(this);
-      };
-
-      // Assume first row is the header and attach a click handler to each.
-      for (i = 0; i < firstRow.cells.length; i++) {
-        cell = firstRow.cells[i];
-        if (!cell.classList.contains('no-sort')) {
-          cell.classList.add('sort-header');
-          cell.tabindex = 0;
-          cell.addEventListener('click', onClick, false);
-
-          if (cell.classList.contains('sort-default')) {
-            defaultSort = cell;
-          }
-        }
-      }
-
-      if (defaultSort) {
-        that.current = defaultSort;
-        that.sortTable(defaultSort);
-      }
-    },
-
-    sortTable: function(header, update) {
-      var that = this,
-          column = header.cellIndex,
-          sortFunction = caseInsensitiveSort,
-          item = '',
-          items = [],
-          i = that.thead ? 0 : 1,
-          sortMethod = header.getAttribute('data-sort-method');
-
-      that.table.dispatchEvent(createEvent('beforeSort'));
-
-      if (that.table.rows.length < 2) return;
-
-      // If we force a sort method, it is not necessary to check rows
-      if (!sortMethod) {
-        while (items.length < 3 && i < that.table.tBodies[0].rows.length) {
-          item = getInnerText(that.table.tBodies[0].rows[i].cells[column]);
-          item = item.trim();
-
-          if (item.length > 0) {
-            items.push(item);
-          }
-
-          i++;
-        }
-
-        if (!items) return;
-      }
-
-      for (i = 0; i < sortOptions.length; i++) {
-        item = sortOptions[i];
-
-        if (sortMethod) {
-          if (item.name === sortMethod) {
-            sortFunction = item.sort;
-            break;
-          }
-        } else if (items.every(item.pattern)) {
-          sortFunction = item.sort;
-          break;
-        }
-      }
-
-      that.col = column;
-      var newRows = [],
-          noSorts = {},
-          j,
-          totalRows = 0,
-          noSortsSoFar = 0,
-          sortDir;
-
-      for (i = 0; i < that.table.tBodies.length; i++) {
-        for (j = 0; j < that.table.tBodies[i].rows.length; j++) {
-          item = that.table.tBodies[i].rows[j];
-          if (item.classList.contains('no-sort')) {
-            // keep no-sorts in separate list to be able to insert
-            // them back at their original position later
-            noSorts[totalRows] = item;
-          } else {
-            // Save the index for stable sorting
-            newRows.push({
-              tr: item,
-              td: getInnerText(item.cells[that.col]),
-              index: totalRows
-            });
-          }
-          totalRows++;
-        }
-      }
-
-      // If updating an existing sort `sortDir` should remain unchanged.
-      if (update) {
-        sortDir = header.classList.contains('sort-up') ? 'sort-up' : 'sort-down';
-      } else {
-        if (header.classList.contains('sort-up')) {
-          sortDir = 'sort-down';
-        } else if (header.classList.contains('sort-down')) {
-          sortDir = 'sort-up';
-        } else {
-          sortDir = that.options.descending ? 'sort-up' : 'sort-down';
-        }
-
-        header.classList.remove(sortDir === 'sort-down' ? 'sort-up' : 'sort-down');
-        header.classList.add(sortDir);
-      }
-
-      // Before we append should we reverse the new array or not?
-      // If we reverse, the sort needs to be `anti-stable` so that
-      // the double negatives cancel out
-      if (sortDir === 'sort-down') {
-        newRows.sort(stabilize(sortFunction, true));
-        newRows.reverse();
-      } else {
-        newRows.sort(stabilize(sortFunction, false));
-      }
-
-      // append rows that already exist rather than creating new ones
-      for (i = 0; i < totalRows; i++) {
-        if (noSorts[i]) {
-          // We have a no-sort row for this position, insert it here.
-          item = noSorts[i];
-          noSortsSoFar++;
-        } else {
-          item = newRows[i - noSortsSoFar].tr;
-        }
-
-        // appendChild(x) moves x if already present somewhere else in the DOM
-        that.table.tBodies[0].appendChild(item);
-      }
-
-      that.table.dispatchEvent(createEvent('afterSort'));
-    },
-
-    refresh: function() {
-      if (this.current !== undefined) {
-        this.sortTable(this.current, true);
-      }
-    }
-  };
-
-  if (typeof module !== 'undefined' && module.exports) {
-    module.exports = Tablesort;
-  } else {
-    window.Tablesort = Tablesort;
-  }
-})();

lib/tablesort/lib/tablesort.numeric.js

@@ -1,26 +0,0 @@
-(function(){
-  var cleanNumber = function(i) {
-    return i.replace(/[^\-?0-9.]/g, '');
-  },
-
-  compareNumber = function(a, b) {
-    a = parseFloat(a);
-    b = parseFloat(b);
-
-    a = isNaN(a) ? 0 : a;
-    b = isNaN(b) ? 0 : b;
-
-    return a - b;
-  };
-
-  Tablesort.extend('number', function(item) {
-    return item.match(/^-?[£\x24Û¢´€]?\d+\s*([,\.]\d{0,2})/) || // Prefixed currency
-      item.match(/^-?\d+\s*([,\.]\d{0,2})?[£\x24Û¢´€]/) || // Suffixed currency
-      item.match(/^-?(\d)*-?([,\.]){0,1}-?(\d)+([E,e][\-+][\d]+)?%?$/); // Number
-  }, function(a, b) {
-    a = cleanNumber(a);
-    b = cleanNumber(b);
-
-    return compareNumber(b, a);
-  });
-}());

lib/tablesort/lib_tablesort.php

@@ -1,10 +0,0 @@
-<?php
-namespace LIB;
-class lib_tablesort extends \LIB\lib_js{
-    public static function get_class(){
-        return self::class;}
-    public static function js_path(){
-        return \SYSTEM\WEBPATH(new \SYSTEM\PLIB(),'/tablesort/lib/tablesort.js');}
-    public static function version(){
-        return '<a href="https://github.com/tristen/tablesort" target="_blank">https://github.com/tristen/tablesort</a> (commit: 941a656c3e)';}
-}

lib/tablesort/lib_tablesort_date.php

@@ -1,10 +0,0 @@
-<?php
-namespace LIB;
-class lib_tablesort_date extends \LIB\lib_js{
-    public static function get_class(){
-        return self::class;}
-    public static function js_path(){
-        return \SYSTEM\WEBPATH(new \SYSTEM\PLIB(),'/tablesort/lib/tablesort.date.js');}
-    public static function version(){
-        return '<a href="https://github.com/tristen/tablesort" target="_blank">https://github.com/tristen/tablesort</a> (commit: 941a656c3e)';}
-}

lib/tablesort/lib_tablesort_numeric.php

@@ -1,10 +0,0 @@
-<?php
-namespace LIB;
-class lib_tablesort_numeric extends \LIB\lib_js{
-    public static function get_class(){
-        return self::class;}
-    public static function js_path(){
-        return \SYSTEM\WEBPATH(new \SYSTEM\PLIB(),'/tablesort/lib/tablesort.numeric.js');}
-    public static function version(){
-        return '<a href="https://github.com/tristen/tablesort" target="_blank">https://github.com/tristen/tablesort</a> (commit: 941a656c3e)';}
-}

lib/tablesorter

@@ -1 +1 @@
-Subproject commit 5c11af9dcf4d5790825be763e722023d7ab62f01
+Subproject commit 4765518860d3f7f25617bc73db12ed56a7f1fdae

sai/page/default_page.php

@@ -33,7 +33,7 @@ class default_page extends \SYSTEM\PAGE\Page {
     private static function css(){
         $result =   '<link rel="stylesheet" href="'.\LIB\lib_bootstrap::css().'" type="text/css" />'.
                     '<link rel="stylesheet" href="'.\LIB\lib_system::css().'" type="text/css" />'.
-                    '<link rel="stylesheet" href="'.\LIB\lib_tablesorter_css::js().'" type="text/css" />'.
+                    '<link rel="stylesheet" href="'.\LIB\lib_tablesorter::css().'" type="text/css" />'.
                     '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai_classes.css').'" type="text/css" />'.
                     '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai.css').'" type="text/css" />';
         return $result;