From 667f4edb86a9f7c499796646fa099f4922604773 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 9 May 2018 18:40:57 +0100 Subject: [PATCH] resources: Move various single-file mediawiki.* modules to src/ This moves all files belonging to a 'mediawiki.*' module containing only a single JavaScript file with no references to other files. * Reduce clutter in src/mediawiki/. * Make these files and modules easier to discover and associate. Bug: T193826 Change-Id: I677edac3b5e9d02208c87164382c97035409df63 --- resources/Resources.php | 24 +++++++++---------- .../src/{mediawiki => }/mediawiki.RegExp.js | 0 .../src/{mediawiki => }/mediawiki.String.js | 0 .../src/{mediawiki => }/mediawiki.cookie.js | 0 .../{mediawiki => }/mediawiki.experiments.js | 0 .../src/{mediawiki => }/mediawiki.inspect.js | 0 .../src/{mediawiki => }/mediawiki.notify.js | 0 .../src/{mediawiki => }/mediawiki.storage.js | 0 .../src/{mediawiki => }/mediawiki.user.js | 0 .../{mediawiki => }/mediawiki.userSuggest.js | 0 .../src/{mediawiki => }/mediawiki.util.js | 0 .../src/{mediawiki => }/mediawiki.viewport.js | 0 .../mediawiki.visibleTimeout.js | 0 13 files changed, 12 insertions(+), 12 deletions(-) rename resources/src/{mediawiki => }/mediawiki.RegExp.js (100%) rename resources/src/{mediawiki => }/mediawiki.String.js (100%) rename resources/src/{mediawiki => }/mediawiki.cookie.js (100%) rename resources/src/{mediawiki => }/mediawiki.experiments.js (100%) rename resources/src/{mediawiki => }/mediawiki.inspect.js (100%) rename resources/src/{mediawiki => }/mediawiki.notify.js (100%) rename resources/src/{mediawiki => }/mediawiki.storage.js (100%) rename resources/src/{mediawiki => }/mediawiki.user.js (100%) rename resources/src/{mediawiki => }/mediawiki.userSuggest.js (100%) rename resources/src/{mediawiki => }/mediawiki.util.js (100%) rename resources/src/{mediawiki => }/mediawiki.viewport.js (100%) rename resources/src/{mediawiki => }/mediawiki.visibleTimeout.js (100%) diff --git a/resources/Resources.php b/resources/Resources.php index 2a343c970d..d41352e5aa 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1125,7 +1125,7 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.inspect' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.inspect.js', + 'scripts' => 'resources/src/mediawiki.inspect.js', 'dependencies' => [ 'mediawiki.String', 'mediawiki.RegExp', @@ -1171,7 +1171,7 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.notify' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.notify.js', + 'scripts' => 'resources/src/mediawiki.notify.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.notification.convertmessagebox' => [ @@ -1188,11 +1188,11 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.RegExp' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.RegExp.js', + 'scripts' => 'resources/src/mediawiki.RegExp.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.String' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.String.js', + 'scripts' => 'resources/src/mediawiki.String.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.pager.tablePager' => [ @@ -1213,7 +1213,7 @@ return [ ], ], 'mediawiki.storage' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.storage.js', + 'scripts' => 'resources/src/mediawiki.storage.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.Title' => [ @@ -1368,7 +1368,7 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.user' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.user.js', + 'scripts' => 'resources/src/mediawiki.user.js', 'dependencies' => [ 'mediawiki.api', 'mediawiki.api.user', @@ -1379,7 +1379,7 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.userSuggest' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.userSuggest.js', + 'scripts' => 'resources/src/mediawiki.userSuggest.js', 'dependencies' => [ 'jquery.suggestions', 'mediawiki.api' @@ -1387,7 +1387,7 @@ return [ ], 'mediawiki.util' => [ 'class' => ResourceLoaderMediaWikiUtilModule::class, - 'scripts' => 'resources/src/mediawiki/mediawiki.util.js', + 'scripts' => 'resources/src/mediawiki.util.js', 'dependencies' => [ 'jquery.accessKeyLabel', 'mediawiki.RegExp', @@ -1396,7 +1396,7 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.viewport' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.viewport.js', + 'scripts' => 'resources/src/mediawiki.viewport.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.checkboxtoggle' => [ @@ -1406,7 +1406,7 @@ return [ 'styles' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.css', ], 'mediawiki.cookie' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.cookie.js', + 'scripts' => 'resources/src/mediawiki.cookie.js', 'dependencies' => 'jquery.cookie', 'targets' => [ 'desktop', 'mobile' ], ], @@ -1417,7 +1417,7 @@ return [ 'dependencies' => 'jquery.textSelection', ], 'mediawiki.experiments' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.experiments.js', + 'scripts' => 'resources/src/mediawiki.experiments.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.editfont.styles' => [ @@ -1425,7 +1425,7 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.visibleTimeout' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.visibleTimeout.js', + 'scripts' => 'resources/src/mediawiki.visibleTimeout.js', 'targets' => [ 'desktop', 'mobile' ], ], diff --git a/resources/src/mediawiki/mediawiki.RegExp.js b/resources/src/mediawiki.RegExp.js similarity index 100% rename from resources/src/mediawiki/mediawiki.RegExp.js rename to resources/src/mediawiki.RegExp.js diff --git a/resources/src/mediawiki/mediawiki.String.js b/resources/src/mediawiki.String.js similarity index 100% rename from resources/src/mediawiki/mediawiki.String.js rename to resources/src/mediawiki.String.js diff --git a/resources/src/mediawiki/mediawiki.cookie.js b/resources/src/mediawiki.cookie.js similarity index 100% rename from resources/src/mediawiki/mediawiki.cookie.js rename to resources/src/mediawiki.cookie.js diff --git a/resources/src/mediawiki/mediawiki.experiments.js b/resources/src/mediawiki.experiments.js similarity index 100% rename from resources/src/mediawiki/mediawiki.experiments.js rename to resources/src/mediawiki.experiments.js diff --git a/resources/src/mediawiki/mediawiki.inspect.js b/resources/src/mediawiki.inspect.js similarity index 100% rename from resources/src/mediawiki/mediawiki.inspect.js rename to resources/src/mediawiki.inspect.js diff --git a/resources/src/mediawiki/mediawiki.notify.js b/resources/src/mediawiki.notify.js similarity index 100% rename from resources/src/mediawiki/mediawiki.notify.js rename to resources/src/mediawiki.notify.js diff --git a/resources/src/mediawiki/mediawiki.storage.js b/resources/src/mediawiki.storage.js similarity index 100% rename from resources/src/mediawiki/mediawiki.storage.js rename to resources/src/mediawiki.storage.js diff --git a/resources/src/mediawiki/mediawiki.user.js b/resources/src/mediawiki.user.js similarity index 100% rename from resources/src/mediawiki/mediawiki.user.js rename to resources/src/mediawiki.user.js diff --git a/resources/src/mediawiki/mediawiki.userSuggest.js b/resources/src/mediawiki.userSuggest.js similarity index 100% rename from resources/src/mediawiki/mediawiki.userSuggest.js rename to resources/src/mediawiki.userSuggest.js diff --git a/resources/src/mediawiki/mediawiki.util.js b/resources/src/mediawiki.util.js similarity index 100% rename from resources/src/mediawiki/mediawiki.util.js rename to resources/src/mediawiki.util.js diff --git a/resources/src/mediawiki/mediawiki.viewport.js b/resources/src/mediawiki.viewport.js similarity index 100% rename from resources/src/mediawiki/mediawiki.viewport.js rename to resources/src/mediawiki.viewport.js diff --git a/resources/src/mediawiki/mediawiki.visibleTimeout.js b/resources/src/mediawiki.visibleTimeout.js similarity index 100% rename from resources/src/mediawiki/mediawiki.visibleTimeout.js rename to resources/src/mediawiki.visibleTimeout.js -- 2.20.1