james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stop depending on unmaintained tablesorter plugin

Browse Source
This commit is contained in:
Shish 2020-03-26 14:57:38 +00:00
parent 5f5b858175
commit e362f3bad2
6 changed files with 29 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@ -33,15 +33,14 @@
"ifixit/php-akismet" : "1.*", "ifixit/php-akismet" : "1.*",
"google/recaptcha" : "~1.1", "google/recaptcha" : "~1.1",
"dapphp/securimage" : "3.6.*", "dapphp/securimage" : "3.6.*",
"shish/eventtracer-php" : "dev-master", "shish/eventtracer-php" : "^1.0.0",
"shish/ffsphp" : "0.0.*", "shish/ffsphp" : "0.0.*",
"shish/microcrud" : "dev-master", "shish/microcrud" : "^1.0.0",
"shish/microhtml" : "^1.0.0", "shish/microhtml" : "^1.0.0",
"enshrined/svg-sanitize" : "0.13.*", "enshrined/svg-sanitize" : "0.13.*",
"bower-asset/jquery" : "1.12.*", "bower-asset/jquery" : "1.12.*",
"bower-asset/jquery-timeago" : "1.5.*", "bower-asset/jquery-timeago" : "1.5.*",
"bower-asset/tablesorter" : "dev-master",
"bower-asset/mediaelement" : "2.21.*", "bower-asset/mediaelement" : "2.21.*",
"bower-asset/js-cookie" : "2.1.*" "bower-asset/js-cookie" : "2.1.*"
}, },

61
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "3719624fc2c580e06fe8595e6bf6cb71", "content-hash": "b29c81be8da841653840750829153dda",
"packages": [ "packages": [
{ {
"name": "bower-asset/jquery", "name": "bower-asset/jquery",
@ -81,25 +81,6 @@
"MIT" "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", "name": "dapphp/securimage",
"version": "3.6.7", "version": "3.6.7",
@ -302,21 +283,20 @@
}, },
{ {
"name": "shish/eventtracer-php", "name": "shish/eventtracer-php",
"version": "dev-master", "version": "v1.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/shish/eventtracer-php.git", "url": "https://github.com/shish/eventtracer-php.git",
"reference": "57c1eb94028d8973907ee859455d9756b7cc597d" "reference": "e7816dbaa155d9552ee4e5721be799d932518a84"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/shish/eventtracer-php/zipball/57c1eb94028d8973907ee859455d9756b7cc597d", "url": "https://api.github.com/repos/shish/eventtracer-php/zipball/e7816dbaa155d9552ee4e5721be799d932518a84",
"reference": "57c1eb94028d8973907ee859455d9756b7cc597d", "reference": "e7816dbaa155d9552ee4e5721be799d932518a84",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"ext-posix": "*",
"php": "^7.2" "php": "^7.2"
}, },
"require-dev": { "require-dev": {
@ -342,7 +322,7 @@
], ],
"description": "An API to write JSON traces as used by the Chrome Trace Viewer", "description": "An API to write JSON traces as used by the Chrome Trace Viewer",
"homepage": "https://github.com/shish/eventtracer-php", "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", "name": "shish/ffsphp",
@ -388,7 +368,7 @@
}, },
{ {
"name": "shish/microcrud", "name": "shish/microcrud",
"version": "dev-master", "version": "v1.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/shish/microcrud.git", "url": "https://github.com/shish/microcrud.git",
@ -1165,12 +1145,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "014b4c58184c41572c9ae4297c73d9efe2bc9bd3" "reference": "fb668be523b1975b0fb9ee22afbfa8f5acdb840e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/014b4c58184c41572c9ae4297c73d9efe2bc9bd3", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb668be523b1975b0fb9ee22afbfa8f5acdb840e",
"reference": "014b4c58184c41572c9ae4297c73d9efe2bc9bd3", "reference": "fb668be523b1975b0fb9ee22afbfa8f5acdb840e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1240,7 +1220,17 @@
"testing", "testing",
"xunit" "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", "name": "sebastian/code-unit-reverse-lookup",
@ -2006,11 +1996,7 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": { "stability-flags": [],
"shish/eventtracer-php": 20,
"shish/microcrud": 20,
"bower-asset/tablesorter": 20
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
@ -2018,5 +2004,6 @@
"ext-pdo": "*", "ext-pdo": "*",
"ext-json": "*" "ext-json": "*"
}, },
"platform-dev": [] "platform-dev": [],
"plugin-api-version": "1.1.0"
} }

2
ext/ext_manager/theme.php
View File

@ -30,7 +30,7 @@ class ExtManagerTheme extends Themelet
$form = SHM_SIMPLE_FORM( $form = SHM_SIMPLE_FORM(
"ext_manager/set", "ext_manager/set",
TABLE( TABLE(
["id"=>'extensions', "class"=>'zebra sortable'], ["id"=>'extensions', "class"=>'zebra'],
THEAD(TR( THEAD(TR(
$editable ? TH("Enabled") : null, $editable ? TH("Enabled") : null,
TH("Name"), TH("Name"),

2
ext/pm/theme.php
View File

@ -7,7 +7,7 @@ class PrivMsgTheme extends Themelet
global $user; global $user;
$html = " $html = "
<table id='pms' class='zebra sortable'> <table id='pms' class='zebra'>
<thead><tr><th>R?</th><th>Subject</th><th>From</th><th>Date</th><th>Action</th></tr></thead> <thead><tr><th>R?</th><th>Subject</th><th>From</th><th>Date</th><th>Action</th></tr></thead>
<tbody>"; <tbody>";
foreach ($pms as $pm) { foreach ($pms as $pm) {

2
ext/setup/theme.php
View File

@ -63,7 +63,7 @@ class SetupTheme extends Themelet
$table = " $table = "
".make_form(make_link("setup/save"))." ".make_form(make_link("setup/save"))."
<table id='settings' class='sortable zebra'> <table id='settings' class='zebra'>
<thead><tr><th width='25%'>Name</th><th>Value</th></tr></thead> <thead><tr><th width='25%'>Name</th><th>Value</th></tr></thead>
<tbody>$h_rows</tbody> <tbody>$h_rows</tbody>
<tfoot><tr><td colspan='2'><input type='submit' value='Save Settings'></td></tr></tfoot> <tfoot><tr><td colspan='2'><input type='submit' value='Save Settings'></td></tr></tfoot>

3
ext/static_files/script.js
View File

@ -29,9 +29,6 @@ document.addEventListener('DOMContentLoaded', () => {
$.timeago.settings.cutoff = 365 * 24 * 60 * 60 * 1000; // Display original dates older than 1 year $.timeago.settings.cutoff = 365 * 24 * 60 * 60 * 1000; // Display original dates older than 1 year
$("time").timeago(); $("time").timeago();
/** Setup tablesorter **/
$("table.sortable").tablesorter();
/** Setup sidebar toggle **/ /** Setup sidebar toggle **/
let sidebar_hidden = []; let sidebar_hidden = [];
try { try {