From 46a01c422b1731cf57993f4c7a13a7df43f2befc Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Mon, 28 Sep 2015 20:15:48 -0700 Subject: [PATCH] Restructure /resources/src/mediawiki.page/ Follows-up 0bfdd927. Change-Id: I65b9343ea002c332323ededf4e328e4463faf698 --- jsduck.json | 1 - resources/Resources.php | 20 +++++++++---------- .../page/gallery-print.css} | 0 .../page/gallery.css} | 0 .../page/gallery.js} | 0 .../page/image-pagination.js} | 0 .../page/patrol.js} | 0 .../page/ready.js} | 0 .../page/startup.js} | 0 .../page/watch.js} | 0 10 files changed, 10 insertions(+), 11 deletions(-) rename resources/src/{mediawiki.page/mediawiki.page.gallery.print.css => mediawiki/page/gallery-print.css} (100%) rename resources/src/{mediawiki.page/mediawiki.page.gallery.css => mediawiki/page/gallery.css} (100%) rename resources/src/{mediawiki.page/mediawiki.page.gallery.js => mediawiki/page/gallery.js} (100%) rename resources/src/{mediawiki.page/mediawiki.page.image.pagination.js => mediawiki/page/image-pagination.js} (100%) rename resources/src/{mediawiki.page/mediawiki.page.patrol.ajax.js => mediawiki/page/patrol.js} (100%) rename resources/src/{mediawiki.page/mediawiki.page.ready.js => mediawiki/page/ready.js} (100%) rename resources/src/{mediawiki.page/mediawiki.page.startup.js => mediawiki/page/startup.js} (100%) rename resources/src/{mediawiki.page/mediawiki.page.watch.ajax.js => mediawiki/page/watch.js} (100%) diff --git a/jsduck.json b/jsduck.json index c0641ded40..aac76c57b1 100644 --- a/jsduck.json +++ b/jsduck.json @@ -15,7 +15,6 @@ "resources/src/mediawiki.action", "resources/src/mediawiki.language", "resources/src/mediawiki.messagePoster", - "resources/src/mediawiki.page", "resources/src/mediawiki.special", "resources/src/mediawiki.toolbar", "resources/src/mediawiki.widgets", diff --git a/resources/Resources.php b/resources/Resources.php index 3b3769eeeb..d6e13ed3f4 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1479,7 +1479,7 @@ return array( /* MediaWiki Page */ 'mediawiki.page.gallery' => array( - 'scripts' => 'resources/src/mediawiki.page/mediawiki.page.gallery.js', + 'scripts' => 'resources/src/mediawiki/page/gallery.js', 'dependencies' => array( 'mediawiki.page.gallery.styles', 'jquery.throttle-debounce', @@ -1487,14 +1487,14 @@ return array( ), 'mediawiki.page.gallery.styles' => array( 'styles' => array( - 'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ), - 'resources/src/mediawiki.page/mediawiki.page.gallery.css', + 'resources/src/mediawiki/page/gallery-print.css' => array( 'media' => 'print' ), + 'resources/src/mediawiki/page/gallery.css', ), 'position' => 'top', 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.page.ready' => array( - 'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js', + 'scripts' => 'resources/src/mediawiki/page/ready.js', 'dependencies' => array( 'jquery.accessKeyLabel', 'jquery.checkboxShiftClick', @@ -1505,13 +1505,13 @@ return array( 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.page.startup' => array( - 'scripts' => 'resources/src/mediawiki.page/mediawiki.page.startup.js', + 'scripts' => 'resources/src/mediawiki/page/startup.js', 'dependencies' => 'mediawiki.util', 'position' => 'top', 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.page.patrol.ajax' => array( - 'scripts' => 'resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js', + 'scripts' => 'resources/src/mediawiki/page/patrol.js', 'dependencies' => array( 'mediawiki.page.startup', 'mediawiki.api', @@ -1528,7 +1528,7 @@ return array( ), ), 'mediawiki.page.watch.ajax' => array( - 'scripts' => 'resources/src/mediawiki.page/mediawiki.page.watch.ajax.js', + 'scripts' => 'resources/src/mediawiki/page/watch.js', 'dependencies' => array( 'mediawiki.api.watch', 'mediawiki.notify', @@ -1547,7 +1547,7 @@ return array( ), ), 'mediawiki.page.image.pagination' => array( - 'scripts' => 'resources/src/mediawiki.page/mediawiki.page.image.pagination.js', + 'scripts' => 'resources/src/mediawiki/page/image-pagination.js', 'dependencies' => array( 'mediawiki.Uri', 'mediawiki.util', @@ -1772,7 +1772,7 @@ return array( 'position' => 'top', 'styles' => array( // @todo: Remove mediawiki.page.gallery when cache has cleared - 'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ), + 'resources/src/mediawiki/page/gallery-print.css' => array( 'media' => 'print' ), // @todo: Remove mediawiki.action.view.filepage.print.css when cache has cleared 'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ), @@ -1789,7 +1789,7 @@ return array( 'position' => 'top', 'styles' => array( // @todo: Remove when mediawiki.page.gallery in cached html. - 'resources/src/mediawiki.page/mediawiki.page.gallery.css', + 'resources/src/mediawiki/page/gallery.css', // @todo: Remove mediawiki.action.view.filepage.css // and mediawiki.legacy/images/checker.png when cache has cleared 'resources/src/mediawiki.action/mediawiki.action.view.filepage.css', diff --git a/resources/src/mediawiki.page/mediawiki.page.gallery.print.css b/resources/src/mediawiki/page/gallery-print.css similarity index 100% rename from resources/src/mediawiki.page/mediawiki.page.gallery.print.css rename to resources/src/mediawiki/page/gallery-print.css diff --git a/resources/src/mediawiki.page/mediawiki.page.gallery.css b/resources/src/mediawiki/page/gallery.css similarity index 100% rename from resources/src/mediawiki.page/mediawiki.page.gallery.css rename to resources/src/mediawiki/page/gallery.css diff --git a/resources/src/mediawiki.page/mediawiki.page.gallery.js b/resources/src/mediawiki/page/gallery.js similarity index 100% rename from resources/src/mediawiki.page/mediawiki.page.gallery.js rename to resources/src/mediawiki/page/gallery.js diff --git a/resources/src/mediawiki.page/mediawiki.page.image.pagination.js b/resources/src/mediawiki/page/image-pagination.js similarity index 100% rename from resources/src/mediawiki.page/mediawiki.page.image.pagination.js rename to resources/src/mediawiki/page/image-pagination.js diff --git a/resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js b/resources/src/mediawiki/page/patrol.js similarity index 100% rename from resources/src/mediawiki.page/mediawiki.page.patrol.ajax.js rename to resources/src/mediawiki/page/patrol.js diff --git a/resources/src/mediawiki.page/mediawiki.page.ready.js b/resources/src/mediawiki/page/ready.js similarity index 100% rename from resources/src/mediawiki.page/mediawiki.page.ready.js rename to resources/src/mediawiki/page/ready.js diff --git a/resources/src/mediawiki.page/mediawiki.page.startup.js b/resources/src/mediawiki/page/startup.js similarity index 100% rename from resources/src/mediawiki.page/mediawiki.page.startup.js rename to resources/src/mediawiki/page/startup.js diff --git a/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js b/resources/src/mediawiki/page/watch.js similarity index 100% rename from resources/src/mediawiki.page/mediawiki.page.watch.ajax.js rename to resources/src/mediawiki/page/watch.js -- 2.20.1