From e362f3bad2421ff87e7e8d8c4595574d583ad212 Mon Sep 17 00:00:00 2001 From: Shish Date: Thu, 26 Mar 2020 14:57:38 +0000 Subject: [PATCH] stop depending on unmaintained tablesorter plugin --- composer.json | 5 ++-- composer.lock | 61 +++++++++++++++----------------------- ext/ext_manager/theme.php | 2 +- ext/pm/theme.php | 2 +- ext/setup/theme.php | 2 +- ext/static_files/script.js | 3 -- 6 files changed, 29 insertions(+), 46 deletions(-) diff --git a/composer.json b/composer.json index 097f2d37..57eb466f 100644 --- a/composer.json +++ b/composer.json @@ -33,15 +33,14 @@ "ifixit/php-akismet" : "1.*", "google/recaptcha" : "~1.1", "dapphp/securimage" : "3.6.*", - "shish/eventtracer-php" : "dev-master", + "shish/eventtracer-php" : "^1.0.0", "shish/ffsphp" : "0.0.*", - "shish/microcrud" : "dev-master", + "shish/microcrud" : "^1.0.0", "shish/microhtml" : "^1.0.0", "enshrined/svg-sanitize" : "0.13.*", "bower-asset/jquery" : "1.12.*", "bower-asset/jquery-timeago" : "1.5.*", - "bower-asset/tablesorter" : "dev-master", "bower-asset/mediaelement" : "2.21.*", "bower-asset/js-cookie" : "2.1.*" }, diff --git a/composer.lock b/composer.lock index 62a5cd41..90687fec 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3719624fc2c580e06fe8595e6bf6cb71", + "content-hash": "b29c81be8da841653840750829153dda", "packages": [ { "name": "bower-asset/jquery", @@ -81,25 +81,6 @@ "MIT" ] }, - { - "name": "bower-asset/tablesorter", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/christianbach/tablesorter.git", - "reference": "07e0918254df3c2057d6d8e4653a0769f1881412" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/christianbach/tablesorter/zipball/07e0918254df3c2057d6d8e4653a0769f1881412", - "reference": "07e0918254df3c2057d6d8e4653a0769f1881412" - }, - "type": "bower-asset", - "license": [ - "MIT,GPL" - ], - "time": "2017-12-20T18:16:21+00:00" - }, { "name": "dapphp/securimage", "version": "3.6.7", @@ -302,21 +283,20 @@ }, { "name": "shish/eventtracer-php", - "version": "dev-master", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/shish/eventtracer-php.git", - "reference": "57c1eb94028d8973907ee859455d9756b7cc597d" + "reference": "e7816dbaa155d9552ee4e5721be799d932518a84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shish/eventtracer-php/zipball/57c1eb94028d8973907ee859455d9756b7cc597d", - "reference": "57c1eb94028d8973907ee859455d9756b7cc597d", + "url": "https://api.github.com/repos/shish/eventtracer-php/zipball/e7816dbaa155d9552ee4e5721be799d932518a84", + "reference": "e7816dbaa155d9552ee4e5721be799d932518a84", "shasum": "" }, "require": { "ext-json": "*", - "ext-posix": "*", "php": "^7.2" }, "require-dev": { @@ -342,7 +322,7 @@ ], "description": "An API to write JSON traces as used by the Chrome Trace Viewer", "homepage": "https://github.com/shish/eventtracer-php", - "time": "2020-03-16T15:07:22+00:00" + "time": "2020-03-26T14:11:54+00:00" }, { "name": "shish/ffsphp", @@ -388,7 +368,7 @@ }, { "name": "shish/microcrud", - "version": "dev-master", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/shish/microcrud.git", @@ -1165,12 +1145,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "014b4c58184c41572c9ae4297c73d9efe2bc9bd3" + "reference": "fb668be523b1975b0fb9ee22afbfa8f5acdb840e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/014b4c58184c41572c9ae4297c73d9efe2bc9bd3", - "reference": "014b4c58184c41572c9ae4297c73d9efe2bc9bd3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb668be523b1975b0fb9ee22afbfa8f5acdb840e", + "reference": "fb668be523b1975b0fb9ee22afbfa8f5acdb840e", "shasum": "" }, "require": { @@ -1240,7 +1220,17 @@ "testing", "xunit" ], - "time": "2020-03-11T07:08:11+00:00" + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-03-25T06:16:24+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -2006,11 +1996,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "shish/eventtracer-php": 20, - "shish/microcrud": 20, - "bower-asset/tablesorter": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -2018,5 +2004,6 @@ "ext-pdo": "*", "ext-json": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php index e9235f46..781a4ed3 100644 --- a/ext/ext_manager/theme.php +++ b/ext/ext_manager/theme.php @@ -30,7 +30,7 @@ class ExtManagerTheme extends Themelet $form = SHM_SIMPLE_FORM( "ext_manager/set", TABLE( - ["id"=>'extensions', "class"=>'zebra sortable'], + ["id"=>'extensions', "class"=>'zebra'], THEAD(TR( $editable ? TH("Enabled") : null, TH("Name"), diff --git a/ext/pm/theme.php b/ext/pm/theme.php index 850de817..bb1e8346 100644 --- a/ext/pm/theme.php +++ b/ext/pm/theme.php @@ -7,7 +7,7 @@ class PrivMsgTheme extends Themelet global $user; $html = " - +
"; foreach ($pms as $pm) { diff --git a/ext/setup/theme.php b/ext/setup/theme.php index 56e29460..f19a6b83 100644 --- a/ext/setup/theme.php +++ b/ext/setup/theme.php @@ -63,7 +63,7 @@ class SetupTheme extends Themelet $table = " ".make_form(make_link("setup/save"))." -
R?SubjectFromDateAction
+
$h_rows diff --git a/ext/static_files/script.js b/ext/static_files/script.js index a7680550..b74185dc 100644 --- a/ext/static_files/script.js +++ b/ext/static_files/script.js @@ -29,9 +29,6 @@ document.addEventListener('DOMContentLoaded', () => { $.timeago.settings.cutoff = 365 * 24 * 60 * 60 * 1000; // Display original dates older than 1 year $("time").timeago(); - /** Setup tablesorter **/ - $("table.sortable").tablesorter(); - /** Setup sidebar toggle **/ let sidebar_hidden = []; try {
NameValue