From 9d969334c73c19e276a8de2c664bcf3702a1a418 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 9 May 2018 18:12:15 +0100 Subject: [PATCH] jquery.tablesorter: Move files to their own directory * Reduce clutter in src/jquery/. * Make it easier to see which files belong to which module, especially src/jquery/images/ which was confusingly shared between multiple modules. This also helps emphasize that while jquery.tablesorter.less is included, jquery.tablesorter.styles.less is not. Also follows-up 8cdfcc5fd, which placed its style-module definition among the 'mediawiki.*' modules instead of near the 'jquery.*' modules. Change-Id: Ib639de5df323a36982ecdd89158a939beaaa2dd3 --- resources/Resources.php | 17 ++++++++--------- .../images/sort_both.png | Bin .../images/sort_both.svg | 0 .../images/sort_down.png | Bin .../images/sort_down.svg | 0 .../images/sort_up.png | Bin .../images/sort_up.svg | 0 .../jquery.tablesorter.js | 0 .../jquery.tablesorter.less | 0 9 files changed, 8 insertions(+), 9 deletions(-) rename resources/src/{jquery => jquery.tablesorter}/images/sort_both.png (100%) rename resources/src/{jquery => jquery.tablesorter}/images/sort_both.svg (100%) rename resources/src/{jquery => jquery.tablesorter}/images/sort_down.png (100%) rename resources/src/{jquery => jquery.tablesorter}/images/sort_down.svg (100%) rename resources/src/{jquery => jquery.tablesorter}/images/sort_up.png (100%) rename resources/src/{jquery => jquery.tablesorter}/images/sort_up.svg (100%) rename resources/src/{jquery => jquery.tablesorter}/jquery.tablesorter.js (100%) rename resources/src/{jquery => jquery.tablesorter}/jquery.tablesorter.less (100%) diff --git a/resources/Resources.php b/resources/Resources.php index e8a5e24b92..fb24c39c0b 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -112,13 +112,6 @@ return [ 'resources/src/mediawiki.skinning/interface.css' => [ 'media' => 'screen' ], ], ], - - 'jquery.tablesorter.styles' => [ - 'targets' => [ 'desktop', 'mobile' ], - 'styles' => [ - 'resources/src/jquery/jquery.tablesorter.styles.less', - ], - ], 'jquery.makeCollapsible.styles' => [ 'targets' => [ 'desktop', 'mobile' ], 'class' => ResourceLoaderLessVarFileModule::class, @@ -328,8 +321,8 @@ return [ 'scripts' => 'resources/src/jquery/jquery.tabIndex.js', ], 'jquery.tablesorter' => [ - 'scripts' => 'resources/src/jquery/jquery.tablesorter.js', - 'styles' => 'resources/src/jquery/jquery.tablesorter.less', + 'scripts' => 'resources/src/jquery.tablesorter/jquery.tablesorter.js', + 'styles' => 'resources/src/jquery.tablesorter/jquery.tablesorter.less', 'messages' => [ 'sort-descending', 'sort-ascending' ], 'dependencies' => [ 'jquery.tablesorter.styles', @@ -337,6 +330,12 @@ return [ 'mediawiki.language.months', ], ], + 'jquery.tablesorter.styles' => [ + 'targets' => [ 'desktop', 'mobile' ], + 'styles' => [ + 'resources/src/jquery/jquery.tablesorter.styles.less', + ], + ], 'jquery.textSelection' => [ 'scripts' => 'resources/src/jquery/jquery.textSelection.js', 'dependencies' => 'jquery.client', diff --git a/resources/src/jquery/images/sort_both.png b/resources/src/jquery.tablesorter/images/sort_both.png similarity index 100% rename from resources/src/jquery/images/sort_both.png rename to resources/src/jquery.tablesorter/images/sort_both.png diff --git a/resources/src/jquery/images/sort_both.svg b/resources/src/jquery.tablesorter/images/sort_both.svg similarity index 100% rename from resources/src/jquery/images/sort_both.svg rename to resources/src/jquery.tablesorter/images/sort_both.svg diff --git a/resources/src/jquery/images/sort_down.png b/resources/src/jquery.tablesorter/images/sort_down.png similarity index 100% rename from resources/src/jquery/images/sort_down.png rename to resources/src/jquery.tablesorter/images/sort_down.png diff --git a/resources/src/jquery/images/sort_down.svg b/resources/src/jquery.tablesorter/images/sort_down.svg similarity index 100% rename from resources/src/jquery/images/sort_down.svg rename to resources/src/jquery.tablesorter/images/sort_down.svg diff --git a/resources/src/jquery/images/sort_up.png b/resources/src/jquery.tablesorter/images/sort_up.png similarity index 100% rename from resources/src/jquery/images/sort_up.png rename to resources/src/jquery.tablesorter/images/sort_up.png diff --git a/resources/src/jquery/images/sort_up.svg b/resources/src/jquery.tablesorter/images/sort_up.svg similarity index 100% rename from resources/src/jquery/images/sort_up.svg rename to resources/src/jquery.tablesorter/images/sort_up.svg diff --git a/resources/src/jquery/jquery.tablesorter.js b/resources/src/jquery.tablesorter/jquery.tablesorter.js similarity index 100% rename from resources/src/jquery/jquery.tablesorter.js rename to resources/src/jquery.tablesorter/jquery.tablesorter.js diff --git a/resources/src/jquery/jquery.tablesorter.less b/resources/src/jquery.tablesorter/jquery.tablesorter.less similarity index 100% rename from resources/src/jquery/jquery.tablesorter.less rename to resources/src/jquery.tablesorter/jquery.tablesorter.less -- 2.20.1