From 5924bdd50d2933417814e905a17085797d3f56e4 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 9 May 2018 18:01:59 +0100 Subject: [PATCH] mediawiki.notification: Move files to their own directory * Reduce clutter in src/mediawiki/. * Make it easier to see from the repo structure which files belong to this module, and which files not. For example, 'mediawiki.notification.convertmessagebox' and 'mediawiki.notify' are logically related, but not actually part of this 4-file module. Bug: T193826 Change-Id: I274323dffa8af1d046beb21d88f633f432a6ebbc --- jsduck.json | 1 + resources/Resources.php | 8 ++++---- .../common.css} | 0 .../default.css} | 0 .../notification.js} | 0 .../print.css} | 0 6 files changed, 5 insertions(+), 4 deletions(-) rename resources/src/{mediawiki/mediawiki.notification.common.css => mediawiki.notification/common.css} (100%) rename resources/src/{mediawiki/mediawiki.notification.css => mediawiki.notification/default.css} (100%) rename resources/src/{mediawiki/mediawiki.notification.js => mediawiki.notification/notification.js} (100%) rename resources/src/{mediawiki/mediawiki.notification.print.css => mediawiki.notification/print.css} (100%) diff --git a/jsduck.json b/jsduck.json index 6fb4544290..78a1be9b5a 100644 --- a/jsduck.json +++ b/jsduck.json @@ -16,6 +16,7 @@ "resources/src/mediawiki.action", "resources/src/mediawiki.language", "resources/src/mediawiki.messagePoster", + "resources/src/mediawiki.notification", "resources/src/mediawiki.rcfilters", "resources/src/mediawiki.special", "resources/src/mediawiki.toolbar", diff --git a/resources/Resources.php b/resources/Resources.php index e8a5e24b92..97f35e1274 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1157,14 +1157,14 @@ return [ ], 'mediawiki.notification' => [ 'styles' => [ - 'resources/src/mediawiki/mediawiki.notification.common.css', - 'resources/src/mediawiki/mediawiki.notification.print.css' + 'resources/src/mediawiki.notification/common.css', + 'resources/src/mediawiki.notification/print.css' => [ 'media' => 'print' ], ], 'skinStyles' => [ - 'default' => 'resources/src/mediawiki/mediawiki.notification.css', + 'default' => 'resources/src/mediawiki.notification/default.css', ], - 'scripts' => 'resources/src/mediawiki/mediawiki.notification.js', + 'scripts' => 'resources/src/mediawiki.notification/notification.js', 'dependencies' => [ 'mediawiki.util', 'mediawiki.visibleTimeout', diff --git a/resources/src/mediawiki/mediawiki.notification.common.css b/resources/src/mediawiki.notification/common.css similarity index 100% rename from resources/src/mediawiki/mediawiki.notification.common.css rename to resources/src/mediawiki.notification/common.css diff --git a/resources/src/mediawiki/mediawiki.notification.css b/resources/src/mediawiki.notification/default.css similarity index 100% rename from resources/src/mediawiki/mediawiki.notification.css rename to resources/src/mediawiki.notification/default.css diff --git a/resources/src/mediawiki/mediawiki.notification.js b/resources/src/mediawiki.notification/notification.js similarity index 100% rename from resources/src/mediawiki/mediawiki.notification.js rename to resources/src/mediawiki.notification/notification.js diff --git a/resources/src/mediawiki/mediawiki.notification.print.css b/resources/src/mediawiki.notification/print.css similarity index 100% rename from resources/src/mediawiki/mediawiki.notification.print.css rename to resources/src/mediawiki.notification/print.css -- 2.20.1