[TikiWiki-commits] [Git][tikiwiki/tiki][27.x] Repair tablesorter
Benoit Grégoire (@benoitg) via TikiWiki-cvs <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <68fa771913c73_2c2947b0c467b9@gitlab-sidekiq-low-urgency-cpu-bound-v2-db6f55d9c-5xpg7.mail> |
Benoit Grégoire pushed to branch 27.x at Tiki Wiki CMS Groupware / Tiki
Commits:
33e55b70 by Jonny Bradley at 2025-10-23T18:36:03+00:00
Repair tablesorter
---
* [FIX] tablesorter: Update the minimum version for mottie/tablesorter to mathc the new file layout (if there is one).
Thanks @benoitg
* [FIX] tablesorter: Delete mottie/tablesorter package if the dist/js dir isn't there, so composer will re-install it
* [FIX] tablesorter: Seems the install of tablesorter in vendor_bundled is completely broken, not really sure why but this seems to fix it.
Different in master as it's been moved to the build process, so not a backport
See merge request tikiwiki/tiki!8846
- - - - -
5 changed files:
- lib/core/Tiki/Composer/CleanVendors.php
- lib/core/Tiki/Composer/RestoreVendors.php
- tiki-setup.php
- vendor_bundled/composer.json
- vendor_bundled/composer.lock
Changes:
=====================================
lib/core/Tiki/Composer/CleanVendors.php
=====================================
@@ -189,63 +189,62 @@ class CleanVendors
[
'addons',
'beta-testing',
- 'css',
- 'dist',
+ 'dist/css',
'bower.json',
'example.json',
'Gruntfile.js',
'package.json',
'tablesorter.jquery.json',
- 'js/extras',
- 'js/jquery.tablesorter.js',
- 'js/jquery.tablesorter.widgets.js',
- 'js/parsers/parser-date.js',
- 'js/parsers/parser-date-extract.js',
- 'js/parsers/parser-date-iso8601.js',
- 'js/parsers/parser-date-month.js',
- 'js/parsers/parser-date-range.js',
- 'js/parsers/parser-date-two-digit-year.js',
- 'js/parsers/parser-date-weekday.js',
- 'js/parsers/parser-duration.js',
- 'js/parsers/parser-feet-inch-fraction.js',
- 'js/parsers/parser-file-type.js',
- 'js/parsers/parser-globalize.js',
- 'js/parsers/parser-huge-numbers.js',
- 'js/parsers/parser-ignore-articles.js',
- 'js/parsers/parser-image.js',
- 'js/parsers/parser-leading-zeros.js',
- 'js/parsers/parser-metric.js',
- 'js/parsers/parser-named-numbers.js',
- 'js/parsers/parser-network.js',
- 'js/parsers/parser-roman.js',
- 'js/widgets/widget-alignChar.js',
- 'js/widgets/widget-build-table.js',
- 'js/widgets/widget-chart.js',
- 'js/widgets/widget-cssStickyHeaders.js',
- 'js/widgets/widget-columns.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-editable.js',
- 'js/widgets/widget-filter.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-filter-formatter-html5.js',
- 'js/widgets/widget-filter-formatter-select2.js',
- 'js/widgets/widget-filter-type-insideRange.js',
- 'js/widgets/widget-formatter.js',
- 'js/widgets/widget-headerTitles.js',
- 'js/widgets/widget-lazyload.js',
- 'js/widgets/widget-mark.js',
- 'js/widgets/widget-print.js',
- 'js/widgets/widget-reflow.js',
- 'js/widgets/widget-repeatheaders.js',
- 'js/widgets/widget-resizable.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-saveSort.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-scroller.js',
- 'js/widgets/widget-sortTbodies.js',
- 'js/widgets/widget-staticRow.js',
- 'js/widgets/widget-stickyHeaders.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-storage.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-toggle.js',
- 'js/widgets/widget-uitheme.js', //in jquery.tablesorter.combined.js
- 'js/widgets/widget-vertical-group.js',
- 'js/widgets/widget-view.js'
+ 'dist/js/extras',
+ 'dist/js/jquery.tablesorter.js',
+ 'dist/js/jquery.tablesorter.widgets.js',
+ 'dist/js/parsers/parser-date.js',
+ 'dist/js/parsers/parser-date-extract.js',
+ 'dist/js/parsers/parser-date-iso8601.js',
+ 'dist/js/parsers/parser-date-month.js',
+ 'dist/js/parsers/parser-date-range.js',
+ 'dist/js/parsers/parser-date-two-digit-year.js',
+ 'dist/js/parsers/parser-date-weekday.js',
+ 'dist/js/parsers/parser-duration.js',
+ 'dist/js/parsers/parser-feet-inch-fraction.js',
+ 'dist/js/parsers/parser-file-type.js',
+ 'dist/js/parsers/parser-globalize.js',
+ 'dist/js/parsers/parser-huge-numbers.js',
+ 'dist/js/parsers/parser-ignore-articles.js',
+ 'dist/js/parsers/parser-image.js',
+ 'dist/js/parsers/parser-leading-zeros.js',
+ 'dist/js/parsers/parser-metric.js',
+ 'dist/js/parsers/parser-named-numbers.js',
+ 'dist/js/parsers/parser-network.js',
+ 'dist/js/parsers/parser-roman.js',
+ 'dist/js/widgets/widget-alignChar.js',
+ 'dist/js/widgets/widget-build-table.js',
+ 'dist/js/widgets/widget-chart.js',
+ 'dist/js/widgets/widget-cssStickyHeaders.js',
+ 'dist/js/widgets/widget-columns.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-editable.js',
+ 'dist/js/widgets/widget-filter.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-filter-formatter-html5.js',
+ 'dist/js/widgets/widget-filter-formatter-select2.js',
+ 'dist/js/widgets/widget-filter-type-insideRange.js',
+ 'dist/js/widgets/widget-formatter.js',
+ 'dist/js/widgets/widget-headerTitles.js',
+ 'dist/js/widgets/widget-lazyload.js',
+ 'dist/js/widgets/widget-mark.js',
+ 'dist/js/widgets/widget-print.js',
+ 'dist/js/widgets/widget-reflow.js',
+ 'dist/js/widgets/widget-repeatheaders.js',
+ 'dist/js/widgets/widget-resizable.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-saveSort.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-scroller.js',
+ 'dist/js/widgets/widget-sortTbodies.js',
+ 'dist/js/widgets/widget-staticRow.js',
+ 'dist/js/widgets/widget-stickyHeaders.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-storage.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-toggle.js',
+ 'dist/js/widgets/widget-uitheme.js', //in jquery.tablesorter.combined.js
+ 'dist/js/widgets/widget-vertical-group.js',
+ 'dist/js/widgets/widget-view.js'
]
);
self::remove(
=====================================
lib/core/Tiki/Composer/RestoreVendors.php
=====================================
@@ -29,7 +29,8 @@ class RestoreVendors
// get back previously "cleaned" widget-output.js for tablesorter export
$package = $repoManager->findPackages('mottie/tablesorter');
- if (! file_exists($vendors . 'mottie/tablesorter/js/widgets/widget-output.js') && ! empty($package[0])) {
+ if (! file_exists($vendors . 'mottie/tablesorter/dist/js/jquery.tablesorter.combined.js') && ! empty($package[0])) {
+ // tablesorter moved from js to dist/js around v2.32 and tiki v27.4
$repoManager->removePackage($package[0]);
}
}
=====================================
tiki-setup.php
=====================================
@@ -632,16 +632,16 @@ if ($prefs['feature_jquery_reflection'] == 'y') {
$headerlib->add_jsfile('vendor_bundled/vendor/jquery-plugins/reflection-jquery/js/reflection.js');
}
if ($prefs['feature_jquery_tablesorter'] == 'y') {
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/jquery.tablesorter.combined.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/parsers/parser-input-select.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-columnSelector.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-filter-formatter-jui.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-grouping.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-math.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-pager.js');
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-output.js'); // APTITUDE NEEDS THIS
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/jquery.tablesorter.combined.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/parsers/parser-input-select.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-columnSelector.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-filter-formatter-jui.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-grouping.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-math.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-pager.min.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-output.min.js'); // APTITUDE NEEDS THIS
//currently only working when ajax is not used
- $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/js/widgets/widget-sort2Hash.js');
+ $headerlib->add_jsfile('vendor_bundled/vendor/mottie/tablesorter/dist/js/widgets/widget-sort2Hash.min.js');
$headerlib->add_jsfile('lib/jquery_tiki/tablesorter.js');
}
=====================================
vendor_bundled/composer.json
=====================================
@@ -223,7 +223,7 @@
"melbahja/seo": "^2.0",
"michelf/php-smartypants": "^1.8.1",
"montefuscolo/xmpp": "~0.8",
- "mottie/tablesorter": "^2.28",
+ "mottie/tablesorter": "^2.32",
"mrrio/jspdf": "1.5.3",
"nagarajanchinnasamy/subtotal": "~1.9",
"nicolaskruchten/pivottable": "^2.20.0",
=====================================
vendor_bundled/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": "e4de71f9ab28ff96f2aa46c05655a1e5",
+ "content-hash": "13887bd147a85fc6cc6f5e8998d1dacc",
"packages": [
{
"name": "Sam152/Javascript-Equal-Height-Responsive-Rows",
@@ -1756,20 +1756,20 @@
},
{
"name": "ezyang/htmlpurifier",
- "version": "v4.18.0",
+ "version": "v4.19.0",
"source": {
"type": "git",
"url": "https://github.com/ezyang/htmlpurifier.git",
- "reference": "cb56001e54359df7ae76dc522d08845dc741621b"
+ "reference": "b287d2a16aceffbf6e0295559b39662612b77fcf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/cb56001e54359df7ae76dc522d08845dc741621b",
- "reference": "cb56001e54359df7ae76dc522d08845dc741621b",
+ "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/b287d2a16aceffbf6e0295559b39662612b77fcf",
+ "reference": "b287d2a16aceffbf6e0295559b39662612b77fcf",
"shasum": ""
},
"require": {
- "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
+ "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0"
},
"require-dev": {
"cerdic/css-tidy": "^1.7 || ^2.0",
@@ -1811,9 +1811,9 @@
],
"support": {
"issues": "https://github.com/ezyang/htmlpurifier/issues",
- "source": "https://github.com/ezyang/htmlpurifier/tree/v4.18.0"
+ "source": "https://github.com/ezyang/htmlpurifier/tree/v4.19.0"
},
- "time": "2024-11-01T03:51:45+00:00"
+ "time": "2025-10-17T16:34:55+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -5160,16 +5160,16 @@
},
{
"name": "league/flysystem",
- "version": "3.30.0",
+ "version": "3.30.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "2203e3151755d874bb2943649dae1eb8533ac93e"
+ "reference": "c139fd65c1f796b926f4aec0df37f6caa959a8da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/2203e3151755d874bb2943649dae1eb8533ac93e",
- "reference": "2203e3151755d874bb2943649dae1eb8533ac93e",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c139fd65c1f796b926f4aec0df37f6caa959a8da",
+ "reference": "c139fd65c1f796b926f4aec0df37f6caa959a8da",
"shasum": ""
},
"require": {
@@ -5237,9 +5237,9 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
- "source": "https://github.com/thephpleague/flysystem/tree/3.30.0"
+ "source": "https://github.com/thephpleague/flysystem/tree/3.30.1"
},
- "time": "2025-06-25T13:29:59+00:00"
+ "time": "2025-10-20T15:35:26+00:00"
},
{
"name": "league/flysystem-local",
@@ -14634,28 +14634,28 @@
},
{
"name": "webmozart/assert",
- "version": "1.11.0",
+ "version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/webmozarts/assert.git",
- "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
+ "reference": "541057574806f942c94662b817a50f63f7345360"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
- "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
+ "url": "https://api.github.com/repos/webmozarts/assert/zipball/541057574806f942c94662b817a50f63f7345360",
+ "reference": "541057574806f942c94662b817a50f63f7345360",
"shasum": ""
},
"require": {
"ext-ctype": "*",
+ "ext-date": "*",
+ "ext-filter": "*",
"php": "^7.2 || ^8.0"
},
- "conflict": {
- "phpstan/phpstan": "<0.12.20",
- "vimeo/psalm": "<4.6.1 || 4.6.2"
- },
- "require-dev": {
- "phpunit/phpunit": "^8.5.13"
+ "suggest": {
+ "ext-intl": "",
+ "ext-simplexml": "",
+ "ext-spl": ""
},
"type": "library",
"extra": {
@@ -14686,9 +14686,9 @@
],
"support": {
"issues": "https://github.com/webmozarts/assert/issues",
- "source": "https://github.com/webmozarts/assert/tree/1.11.0"
+ "source": "https://github.com/webmozarts/assert/tree/1.12.0"
},
- "time": "2022-06-03T18:03:27+00:00"
+ "time": "2025-10-20T12:43:39+00:00"
},
{
"name": "zbateson/mail-mime-parser",
@@ -15727,16 +15727,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.6.1",
+ "version": "v5.6.2",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
+ "reference": "3a454ca033b9e06b63282ce19562e892747449bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
- "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb",
+ "reference": "3a454ca033b9e06b63282ce19562e892747449bb",
"shasum": ""
},
"require": {
@@ -15779,9 +15779,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2"
},
- "time": "2025-08-13T20:13:15+00:00"
+ "time": "2025-10-21T19:32:17+00:00"
},
{
"name": "overtrue/phplint",
@@ -16066,12 +16066,12 @@
"source": {
"type": "git",
"url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
- "reference": "8daeec54772a592ad369be23ae02ed593c71e7f1"
+ "reference": "c55d775037d854842a6f98daeb7e88ed40f80b4f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/8daeec54772a592ad369be23ae02ed593c71e7f1",
- "reference": "8daeec54772a592ad369be23ae02ed593c71e7f1",
+ "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/c55d775037d854842a6f98daeb7e88ed40f80b4f",
+ "reference": "c55d775037d854842a6f98daeb7e88ed40f80b4f",
"shasum": ""
},
"require": {
@@ -16152,20 +16152,20 @@
"type": "thanks_dev"
}
],
- "time": "2025-09-19T19:40:19+00:00"
+ "time": "2025-10-22T21:37:50+00:00"
},
{
"name": "phpcsstandards/phpcsutils",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
- "reference": "b22b59e3d9ec8fe4953e42c7d59117c6eae70eae"
+ "reference": "8b8e17615d04f2fc2cd46fc1d2fd888fa21b3cf9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/b22b59e3d9ec8fe4953e42c7d59117c6eae70eae",
- "reference": "b22b59e3d9ec8fe4953e42c7d59117c6eae70eae",
+ "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/8b8e17615d04f2fc2cd46fc1d2fd888fa21b3cf9",
+ "reference": "8b8e17615d04f2fc2cd46fc1d2fd888fa21b3cf9",
"shasum": ""
},
"require": {
@@ -16245,7 +16245,7 @@
"type": "thanks_dev"
}
],
- "time": "2025-09-05T00:00:03+00:00"
+ "time": "2025-10-16T16:39:32+00:00"
},
{
"name": "phpstan/phpstan",
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/33e55b70cc3b91115dd595d4b866b2f9959f511e
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/33e55b70cc3b91115dd595d4b866b2f9959f511e
You're receiving this email because of your account on gitlab.com.
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs