From ba88625a64173d6597019f98a616dec0979795f7 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 9 May 2018 18:40:57 +0100 Subject: [PATCH] resources: Move more various single-file mediawiki.* modules to src/ * Reduce clutter in src/mediawiki/. * Make these files and modules easier to discover and associate. Follows-up I677edac3b5e, which only moved simple cases where no related modules existed. This commit also moves files for modules that have some related multi-file modules. As well as files that previously did not strictly have their path match directly to their module name. For example: - 'mediawiki.checkboxtoggle.css' to 'mediawiki.checkboxtoggle.styles.css', because its module name is 'mediawiki.checkboxtoggle.styles'. - 'mediawiki/page/gallery-slideshow.js' to 'mediawiki.page.gallery.slideshow.js', because its module name uses a dot, not a dash. - 'mediawiki/page/watch.js' to 'mediawiki.page.watch.ajax.js', because its module name also includes 'ajax'. This also makes it matches the way "mediawiki.page.patrol.ajax" files were already named. Ideas for later: - Consider merging 'mediawiki.ForeignApi' and 'mediawiki.ForeignApi.core.'. - Consider merging 'mediawiki.page.ready' and 'mediawiki.page.startup'. Bug: T193826 Change-Id: I9564b05df305b7d217c9a03b80ce92476279e5c8 --- resources/Resources.php | 62 +++++++++---------- ...ignApi.js => mediawiki.ForeignApi.core.js} | 0 .../mediawiki.ForeignStructuredUpload.js | 0 .../mediawiki.ForeignUpload.js | 0 .../mediawiki.Upload.Dialog.js | 0 .../src/{mediawiki => }/mediawiki.Upload.js | 0 .../category.js => mediawiki.api.category.js} | 0 .../api/edit.js => mediawiki.api.edit.js} | 0 .../{mediawiki/api.js => mediawiki.api.js} | 0 .../api/login.js => mediawiki.api.login.js} | 0 .../messages.js => mediawiki.api.messages.js} | 0 .../options.js => mediawiki.api.options.js} | 0 .../api/parse.js => mediawiki.api.parse.js} | 0 .../rollback.js => mediawiki.api.rollback.js} | 0 .../api/upload.js => mediawiki.api.upload.js} | 0 .../api/user.js => mediawiki.api.user.js} | 0 .../api/watch.js => mediawiki.api.watch.js} | 0 .../{mediawiki => }/mediawiki.apipretty.css | 0 .../mediawiki.checkboxtoggle.js | 0 ...ss => mediawiki.checkboxtoggle.styles.css} | 0 ...ediawiki.notification.convertmessagebox.js | 0 ...notification.convertmessagebox.styles.less | 0 .../gallery.js => mediawiki.page.gallery.js} | 0 ...js => mediawiki.page.gallery.slideshow.js} | 0 ....js => mediawiki.page.image.pagination.js} | 0 ....ajax.js => mediawiki.page.patrol.ajax.js} | 0 .../page/ready.js => mediawiki.page.ready.js} | 0 ...rollback.js => mediawiki.page.rollback.js} | 0 .../startup.js => mediawiki.page.startup.js} | 0 .../watch.js => mediawiki.page.watch.ajax.js} | 0 .../src/{mediawiki => }/mediawiki.template.js | 0 .../mediawiki.template.regexp.js | 0 32 files changed, 31 insertions(+), 31 deletions(-) rename resources/src/{mediawiki/ForeignApi.js => mediawiki.ForeignApi.core.js} (100%) rename resources/src/{mediawiki => }/mediawiki.ForeignStructuredUpload.js (100%) rename resources/src/{mediawiki => }/mediawiki.ForeignUpload.js (100%) rename resources/src/{mediawiki => }/mediawiki.Upload.Dialog.js (100%) rename resources/src/{mediawiki => }/mediawiki.Upload.js (100%) rename resources/src/{mediawiki/api/category.js => mediawiki.api.category.js} (100%) rename resources/src/{mediawiki/api/edit.js => mediawiki.api.edit.js} (100%) rename resources/src/{mediawiki/api.js => mediawiki.api.js} (100%) rename resources/src/{mediawiki/api/login.js => mediawiki.api.login.js} (100%) rename resources/src/{mediawiki/api/messages.js => mediawiki.api.messages.js} (100%) rename resources/src/{mediawiki/api/options.js => mediawiki.api.options.js} (100%) rename resources/src/{mediawiki/api/parse.js => mediawiki.api.parse.js} (100%) rename resources/src/{mediawiki/api/rollback.js => mediawiki.api.rollback.js} (100%) rename resources/src/{mediawiki/api/upload.js => mediawiki.api.upload.js} (100%) rename resources/src/{mediawiki/api/user.js => mediawiki.api.user.js} (100%) rename resources/src/{mediawiki/api/watch.js => mediawiki.api.watch.js} (100%) rename resources/src/{mediawiki => }/mediawiki.apipretty.css (100%) rename resources/src/{mediawiki => }/mediawiki.checkboxtoggle.js (100%) rename resources/src/{mediawiki/mediawiki.checkboxtoggle.css => mediawiki.checkboxtoggle.styles.css} (100%) rename resources/src/{mediawiki => }/mediawiki.notification.convertmessagebox.js (100%) rename resources/src/{mediawiki => }/mediawiki.notification.convertmessagebox.styles.less (100%) rename resources/src/{mediawiki/page/gallery.js => mediawiki.page.gallery.js} (100%) rename resources/src/{mediawiki/page/gallery-slideshow.js => mediawiki.page.gallery.slideshow.js} (100%) rename resources/src/{mediawiki/page/image-pagination.js => mediawiki.page.image.pagination.js} (100%) rename resources/src/{mediawiki/page/patrol.ajax.js => mediawiki.page.patrol.ajax.js} (100%) rename resources/src/{mediawiki/page/ready.js => mediawiki.page.ready.js} (100%) rename resources/src/{mediawiki/page/rollback.js => mediawiki.page.rollback.js} (100%) rename resources/src/{mediawiki/page/startup.js => mediawiki.page.startup.js} (100%) rename resources/src/{mediawiki/page/watch.js => mediawiki.page.watch.ajax.js} (100%) rename resources/src/{mediawiki => }/mediawiki.template.js (100%) rename resources/src/{mediawiki => }/mediawiki.template.regexp.js (100%) diff --git a/resources/Resources.php b/resources/Resources.php index d41352e5aa..4ecf89a6c7 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -869,7 +869,7 @@ return [ 'targets' => [ 'desktop' ], ], 'mediawiki.template' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.template.js', + 'scripts' => 'resources/src/mediawiki.template.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.template.mustache' => [ @@ -881,16 +881,16 @@ return [ 'dependencies' => 'mediawiki.template', ], 'mediawiki.template.regexp' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.template.regexp.js', + 'scripts' => 'resources/src/mediawiki.template.regexp.js', 'targets' => [ 'desktop', 'mobile' ], 'dependencies' => 'mediawiki.template', ], 'mediawiki.apipretty' => [ - 'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css', + 'styles' => 'resources/src/mediawiki.apipretty.css', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.api' => [ - 'scripts' => 'resources/src/mediawiki/api.js', + 'scripts' => 'resources/src/mediawiki.api.js', 'dependencies' => [ 'mediawiki.util', 'user.tokens', @@ -898,14 +898,14 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.api.category' => [ - 'scripts' => 'resources/src/mediawiki/api/category.js', + 'scripts' => 'resources/src/mediawiki.api.category.js', 'dependencies' => [ 'mediawiki.api', 'mediawiki.Title', ], ], 'mediawiki.api.edit' => [ - 'scripts' => 'resources/src/mediawiki/api/edit.js', + 'scripts' => 'resources/src/mediawiki.api.edit.js', 'dependencies' => [ 'mediawiki.api', 'mediawiki.user', @@ -913,21 +913,21 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.api.login' => [ - 'scripts' => 'resources/src/mediawiki/api/login.js', + 'scripts' => 'resources/src/mediawiki.api.login.js', 'dependencies' => 'mediawiki.api', ], 'mediawiki.api.options' => [ - 'scripts' => 'resources/src/mediawiki/api/options.js', + 'scripts' => 'resources/src/mediawiki.api.options.js', 'dependencies' => 'mediawiki.api', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.api.parse' => [ - 'scripts' => 'resources/src/mediawiki/api/parse.js', + 'scripts' => 'resources/src/mediawiki.api.parse.js', 'dependencies' => 'mediawiki.api', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.api.upload' => [ - 'scripts' => 'resources/src/mediawiki/api/upload.js', + 'scripts' => 'resources/src/mediawiki.api.upload.js', 'dependencies' => [ 'mediawiki.api', 'mediawiki.api.edit', @@ -935,27 +935,27 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.api.user' => [ - 'scripts' => 'resources/src/mediawiki/api/user.js', + 'scripts' => 'resources/src/mediawiki.api.user.js', 'dependencies' => [ 'mediawiki.api', ], 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.api.watch' => [ - 'scripts' => 'resources/src/mediawiki/api/watch.js', + 'scripts' => 'resources/src/mediawiki.api.watch.js', 'dependencies' => [ 'mediawiki.api', ], ], 'mediawiki.api.messages' => [ - 'scripts' => 'resources/src/mediawiki/api/messages.js', + 'scripts' => 'resources/src/mediawiki.api.messages.js', 'dependencies' => [ 'mediawiki.api', ], 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.api.rollback' => [ - 'scripts' => 'resources/src/mediawiki/api/rollback.js', + 'scripts' => 'resources/src/mediawiki.api.rollback.js', 'dependencies' => [ 'mediawiki.api', ], @@ -1043,7 +1043,7 @@ return [ 'dependencies' => 'mediawiki.ForeignApi.core', ], 'mediawiki.ForeignApi.core' => [ - 'scripts' => 'resources/src/mediawiki/ForeignApi.js', + 'scripts' => 'resources/src/mediawiki.ForeignApi.core.js', 'dependencies' => [ 'mediawiki.api', 'oojs', @@ -1175,15 +1175,15 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.notification.convertmessagebox' => [ + 'scripts' => 'resources/src/mediawiki.notification.convertmessagebox.js', 'dependencies' => [ 'mediawiki.notification', ], - 'scripts' => 'resources/src/mediawiki/mediawiki.notification.convertmessagebox.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.notification.convertmessagebox.styles' => [ 'styles' => [ - 'resources/src/mediawiki/mediawiki.notification.convertmessagebox.styles.less', + 'resources/src/mediawiki.notification.convertmessagebox.styles.less', ], 'targets' => [ 'desktop', 'mobile' ], ], @@ -1228,13 +1228,13 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.Upload' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.Upload.js', + 'scripts' => 'resources/src/mediawiki.Upload.js', 'dependencies' => [ 'mediawiki.api.upload', ], ], 'mediawiki.ForeignUpload' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.ForeignUpload.js', + 'scripts' => 'resources/src/mediawiki.ForeignUpload.js', 'dependencies' => [ 'mediawiki.ForeignApi', 'mediawiki.Upload', @@ -1250,7 +1250,7 @@ return [ 'class' => ResourceLoaderUploadDialogModule::class, ], 'mediawiki.ForeignStructuredUpload' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js', + 'scripts' => 'resources/src/mediawiki.ForeignStructuredUpload.js', 'dependencies' => [ 'mediawiki.ForeignUpload', 'mediawiki.ForeignStructuredUpload.config', @@ -1261,7 +1261,7 @@ return [ ], 'mediawiki.Upload.Dialog' => [ 'scripts' => [ - 'resources/src/mediawiki/mediawiki.Upload.Dialog.js', + 'resources/src/mediawiki.Upload.Dialog.js', ], 'dependencies' => [ 'mediawiki.Upload.BookletLayout', @@ -1400,10 +1400,10 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.checkboxtoggle' => [ - 'scripts' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.js', + 'scripts' => 'resources/src/mediawiki.checkboxtoggle.js', ], 'mediawiki.checkboxtoggle.styles' => [ - 'styles' => 'resources/src/mediawiki/mediawiki.checkboxtoggle.css', + 'styles' => 'resources/src/mediawiki.checkboxtoggle.styles.css', ], 'mediawiki.cookie' => [ 'scripts' => 'resources/src/mediawiki.cookie.js', @@ -1679,7 +1679,7 @@ return [ /* MediaWiki Page */ 'mediawiki.page.gallery' => [ - 'scripts' => 'resources/src/mediawiki/page/gallery.js', + 'scripts' => 'resources/src/mediawiki.page.gallery.js', 'dependencies' => [ 'mediawiki.page.gallery.styles', 'jquery.throttle-debounce', @@ -1693,7 +1693,7 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.page.gallery.slideshow' => [ - 'scripts' => 'resources/src/mediawiki/page/gallery-slideshow.js', + 'scripts' => 'resources/src/mediawiki.page.gallery.slideshow.js', 'dependencies' => [ 'mediawiki.api', 'mediawiki.Title', @@ -1708,7 +1708,7 @@ return [ ] ], 'mediawiki.page.ready' => [ - 'scripts' => 'resources/src/mediawiki/page/ready.js', + 'scripts' => 'resources/src/mediawiki.page.ready.js', 'dependencies' => [ 'jquery.accessKeyLabel', 'jquery.checkboxShiftClick', @@ -1717,11 +1717,11 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.page.startup' => [ - 'scripts' => 'resources/src/mediawiki/page/startup.js', + 'scripts' => 'resources/src/mediawiki.page.startup.js', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.page.patrol.ajax' => [ - 'scripts' => 'resources/src/mediawiki/page/patrol.ajax.js', + 'scripts' => 'resources/src/mediawiki.page.patrol.ajax.js', 'dependencies' => [ 'mediawiki.api', 'mediawiki.util', @@ -1737,7 +1737,7 @@ return [ ], ], 'mediawiki.page.watch.ajax' => [ - 'scripts' => 'resources/src/mediawiki/page/watch.js', + 'scripts' => 'resources/src/mediawiki.page.watch.ajax.js', 'dependencies' => [ 'mediawiki.api.watch', 'mediawiki.notify', @@ -1762,7 +1762,7 @@ return [ ], ], 'mediawiki.page.rollback' => [ - 'scripts' => 'resources/src/mediawiki/page/rollback.js', + 'scripts' => 'resources/src/mediawiki.page.rollback.js', 'dependencies' => [ 'mediawiki.api.rollback', 'mediawiki.notify', @@ -1775,7 +1775,7 @@ return [ ], ], 'mediawiki.page.image.pagination' => [ - 'scripts' => 'resources/src/mediawiki/page/image-pagination.js', + 'scripts' => 'resources/src/mediawiki.page.image.pagination.js', 'dependencies' => [ 'mediawiki.util', 'jquery.spinner', diff --git a/resources/src/mediawiki/ForeignApi.js b/resources/src/mediawiki.ForeignApi.core.js similarity index 100% rename from resources/src/mediawiki/ForeignApi.js rename to resources/src/mediawiki.ForeignApi.core.js diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js b/resources/src/mediawiki.ForeignStructuredUpload.js similarity index 100% rename from resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js rename to resources/src/mediawiki.ForeignStructuredUpload.js diff --git a/resources/src/mediawiki/mediawiki.ForeignUpload.js b/resources/src/mediawiki.ForeignUpload.js similarity index 100% rename from resources/src/mediawiki/mediawiki.ForeignUpload.js rename to resources/src/mediawiki.ForeignUpload.js diff --git a/resources/src/mediawiki/mediawiki.Upload.Dialog.js b/resources/src/mediawiki.Upload.Dialog.js similarity index 100% rename from resources/src/mediawiki/mediawiki.Upload.Dialog.js rename to resources/src/mediawiki.Upload.Dialog.js diff --git a/resources/src/mediawiki/mediawiki.Upload.js b/resources/src/mediawiki.Upload.js similarity index 100% rename from resources/src/mediawiki/mediawiki.Upload.js rename to resources/src/mediawiki.Upload.js diff --git a/resources/src/mediawiki/api/category.js b/resources/src/mediawiki.api.category.js similarity index 100% rename from resources/src/mediawiki/api/category.js rename to resources/src/mediawiki.api.category.js diff --git a/resources/src/mediawiki/api/edit.js b/resources/src/mediawiki.api.edit.js similarity index 100% rename from resources/src/mediawiki/api/edit.js rename to resources/src/mediawiki.api.edit.js diff --git a/resources/src/mediawiki/api.js b/resources/src/mediawiki.api.js similarity index 100% rename from resources/src/mediawiki/api.js rename to resources/src/mediawiki.api.js diff --git a/resources/src/mediawiki/api/login.js b/resources/src/mediawiki.api.login.js similarity index 100% rename from resources/src/mediawiki/api/login.js rename to resources/src/mediawiki.api.login.js diff --git a/resources/src/mediawiki/api/messages.js b/resources/src/mediawiki.api.messages.js similarity index 100% rename from resources/src/mediawiki/api/messages.js rename to resources/src/mediawiki.api.messages.js diff --git a/resources/src/mediawiki/api/options.js b/resources/src/mediawiki.api.options.js similarity index 100% rename from resources/src/mediawiki/api/options.js rename to resources/src/mediawiki.api.options.js diff --git a/resources/src/mediawiki/api/parse.js b/resources/src/mediawiki.api.parse.js similarity index 100% rename from resources/src/mediawiki/api/parse.js rename to resources/src/mediawiki.api.parse.js diff --git a/resources/src/mediawiki/api/rollback.js b/resources/src/mediawiki.api.rollback.js similarity index 100% rename from resources/src/mediawiki/api/rollback.js rename to resources/src/mediawiki.api.rollback.js diff --git a/resources/src/mediawiki/api/upload.js b/resources/src/mediawiki.api.upload.js similarity index 100% rename from resources/src/mediawiki/api/upload.js rename to resources/src/mediawiki.api.upload.js diff --git a/resources/src/mediawiki/api/user.js b/resources/src/mediawiki.api.user.js similarity index 100% rename from resources/src/mediawiki/api/user.js rename to resources/src/mediawiki.api.user.js diff --git a/resources/src/mediawiki/api/watch.js b/resources/src/mediawiki.api.watch.js similarity index 100% rename from resources/src/mediawiki/api/watch.js rename to resources/src/mediawiki.api.watch.js diff --git a/resources/src/mediawiki/mediawiki.apipretty.css b/resources/src/mediawiki.apipretty.css similarity index 100% rename from resources/src/mediawiki/mediawiki.apipretty.css rename to resources/src/mediawiki.apipretty.css diff --git a/resources/src/mediawiki/mediawiki.checkboxtoggle.js b/resources/src/mediawiki.checkboxtoggle.js similarity index 100% rename from resources/src/mediawiki/mediawiki.checkboxtoggle.js rename to resources/src/mediawiki.checkboxtoggle.js diff --git a/resources/src/mediawiki/mediawiki.checkboxtoggle.css b/resources/src/mediawiki.checkboxtoggle.styles.css similarity index 100% rename from resources/src/mediawiki/mediawiki.checkboxtoggle.css rename to resources/src/mediawiki.checkboxtoggle.styles.css diff --git a/resources/src/mediawiki/mediawiki.notification.convertmessagebox.js b/resources/src/mediawiki.notification.convertmessagebox.js similarity index 100% rename from resources/src/mediawiki/mediawiki.notification.convertmessagebox.js rename to resources/src/mediawiki.notification.convertmessagebox.js diff --git a/resources/src/mediawiki/mediawiki.notification.convertmessagebox.styles.less b/resources/src/mediawiki.notification.convertmessagebox.styles.less similarity index 100% rename from resources/src/mediawiki/mediawiki.notification.convertmessagebox.styles.less rename to resources/src/mediawiki.notification.convertmessagebox.styles.less diff --git a/resources/src/mediawiki/page/gallery.js b/resources/src/mediawiki.page.gallery.js similarity index 100% rename from resources/src/mediawiki/page/gallery.js rename to resources/src/mediawiki.page.gallery.js diff --git a/resources/src/mediawiki/page/gallery-slideshow.js b/resources/src/mediawiki.page.gallery.slideshow.js similarity index 100% rename from resources/src/mediawiki/page/gallery-slideshow.js rename to resources/src/mediawiki.page.gallery.slideshow.js diff --git a/resources/src/mediawiki/page/image-pagination.js b/resources/src/mediawiki.page.image.pagination.js similarity index 100% rename from resources/src/mediawiki/page/image-pagination.js rename to resources/src/mediawiki.page.image.pagination.js diff --git a/resources/src/mediawiki/page/patrol.ajax.js b/resources/src/mediawiki.page.patrol.ajax.js similarity index 100% rename from resources/src/mediawiki/page/patrol.ajax.js rename to resources/src/mediawiki.page.patrol.ajax.js diff --git a/resources/src/mediawiki/page/ready.js b/resources/src/mediawiki.page.ready.js similarity index 100% rename from resources/src/mediawiki/page/ready.js rename to resources/src/mediawiki.page.ready.js diff --git a/resources/src/mediawiki/page/rollback.js b/resources/src/mediawiki.page.rollback.js similarity index 100% rename from resources/src/mediawiki/page/rollback.js rename to resources/src/mediawiki.page.rollback.js diff --git a/resources/src/mediawiki/page/startup.js b/resources/src/mediawiki.page.startup.js similarity index 100% rename from resources/src/mediawiki/page/startup.js rename to resources/src/mediawiki.page.startup.js diff --git a/resources/src/mediawiki/page/watch.js b/resources/src/mediawiki.page.watch.ajax.js similarity index 100% rename from resources/src/mediawiki/page/watch.js rename to resources/src/mediawiki.page.watch.ajax.js diff --git a/resources/src/mediawiki/mediawiki.template.js b/resources/src/mediawiki.template.js similarity index 100% rename from resources/src/mediawiki/mediawiki.template.js rename to resources/src/mediawiki.template.js diff --git a/resources/src/mediawiki/mediawiki.template.regexp.js b/resources/src/mediawiki.template.regexp.js similarity index 100% rename from resources/src/mediawiki/mediawiki.template.regexp.js rename to resources/src/mediawiki.template.regexp.js -- 2.20.1