[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Directory structure should reflect the ResourceLoader defini...
jenkins-bot has submitted this change and it was merged. Change subject: Directory structure should reflect the ResourceLoader definitions .. Directory structure should reflect the ResourceLoader definitions Given we currently have modules defined in extension.json and in hooks it can be really confusing understanding how the code fits together. This change hopefully makes this a little clearer by using folder names that are named after the resource loader modules - this is also consistent with how we do things in our other extensions. A images folder is added to the route so that it is clearer that the images are not used in ResourceLoader module definitions and are only used to illustrate the beta feature. Change-Id: Ia650ec03e3a6d3069165441ddfa069d390be4d10 --- M Popups.hooks.php M extension.json R images/popups-ltr.svg R images/popups-rtl.svg R resources/ext.popups.core/ext.popups.core.js R resources/ext.popups.core/ext.popups.core.less R resources/ext.popups.core/images/cog.png R resources/ext.popups.core/images/cog.svg R resources/ext.popups.core/images/horn-ltr.png R resources/ext.popups.core/images/horn-ltr.svg R resources/ext.popups.core/images/horn-rtl.png R resources/ext.popups.core/images/horn-rtl.svg R resources/ext.popups.desktop/ext.popups.animation.less R resources/ext.popups.desktop/ext.popups.renderer.article.js R resources/ext.popups.desktop/ext.popups.settings.js R resources/ext.popups.desktop/ext.popups.settings.less R resources/ext.popups.desktop/images/footer-ltr.png R resources/ext.popups.desktop/images/footer-ltr.svg R resources/ext.popups.desktop/images/footer-rtl.png R resources/ext.popups.desktop/images/footer-rtl.svg R resources/ext.popups.desktop/images/hovercard.svg R resources/ext.popups.desktop/images/navpop.svg R resources/ext.popups.desktop/popup.mustache R resources/ext.popups.desktop/settings.mustache R resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js R resources/ext.popups.renderer.mobileRenderer/LinkPreview.less R resources/ext.popups.renderer.mobileRenderer/LinkPreviewDrawer.hogan R resources/ext.popups.renderer.mobileRenderer/LinkPreviewDrawer.js R resources/ext.popups.renderer.mobileRenderer/mobileRenderer.js R resources/ext.popups.schemaPopups.utils/ext.popups.schemaPopups.utils.js R resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js R resources/ext.popups.targets.desktopTarget/desktopTarget.js R resources/ext.popups.targets.mobileTarget/mobileTarget.js R tests/qunit/ext.popups.desktopRenderer.test.js 34 files changed, 21 insertions(+), 21 deletions(-) Approvals: jenkins-bot: Verified Phuedx: Looks good to me, approved diff --git a/Popups.hooks.php b/Popups.hooks.php index a0466f0..654a8f4 100644 --- a/Popups.hooks.php +++ b/Popups.hooks.php @@ -30,8 +30,8 @@ 'label-message' => 'popups-message', 'desc-message' => 'popups-desc', 'screenshot' => array( - 'ltr' => "$wgExtensionAssetsPath/Popups/resources/images/popups-ltr.svg", - 'rtl' => "$wgExtensionAssetsPath/Popups/resources/images/popups-rtl.svg", + 'ltr' => "$wgExtensionAssetsPath/Popups/images/popups-ltr.svg", + 'rtl' => "$wgExtensionAssetsPath/Popups/images/popups-rtl.svg", ), 'info-link' => 'https://www.mediawiki.org/wiki/Beta_Features/Hovercards', 'discussion-link' => 'https://www.mediawiki.org/wiki/Talk:Beta_Features/Hovercards', @@ -81,7 +81,7 @@ 'ext.popups.schemaPopups.utils', ], 'scripts' => [ - 'resources/ext.popups.schemaPopups.js', + 'resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js', ] ]; } @@ -90,16 +90,16 @@ $rl->register( "ext.popups.desktop", array( 'scripts' => array( - 'resources/ext.popups.renderer.article.js', - 'resources/ext.popups.settings.js', + 'resources/ext.popups.desktop/ext.popups.renderer.article.js', + 'resources/ext.popups.desktop/ext.popups.settings.js', ), 'templates' => array( - 'popup.mustache' => 'resources/popup.mustache', - 'settings.mustache' => 'resources/settings.mustache', + 'popup.mustache' => 'resources/ext.popups.desktop/popup.mustache', + 'settings.mustache' => 'resources/ext.popups.desktop/settings.mu
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: Directory structure should reflect the ResourceLoader defini...
Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/316415 Change subject: Directory structure should reflect the ResourceLoader definitions .. Directory structure should reflect the ResourceLoader definitions Given we currently have modules defined in extension.json and in hooks it can be really confusing understanding how the code fits together. This change hopefully makes this a little clearer by using folder names that are named after the resource loader modules - this is also consistent with how we do things in our other extensions. A images folder is added to the route so that it is clearer that the images are not used in ResourceLoader module definitions and are only used to illustrate the beta feature. Change-Id: Ia650ec03e3a6d3069165441ddfa069d390be4d10 --- M Popups.hooks.php M extension.json R images/popups-ltr.svg R images/popups-rtl.svg R resources/ext.popups.core/ext.popups.core.js R resources/ext.popups.core/ext.popups.core.less R resources/ext.popups.core/images/cog.png R resources/ext.popups.core/images/cog.svg R resources/ext.popups.core/images/horn-ltr.png R resources/ext.popups.core/images/horn-ltr.svg R resources/ext.popups.core/images/horn-rtl.png R resources/ext.popups.core/images/horn-rtl.svg R resources/ext.popups.desktop/ext.popups.animation.less R resources/ext.popups.desktop/ext.popups.renderer.article.js R resources/ext.popups.desktop/ext.popups.settings.js R resources/ext.popups.desktop/ext.popups.settings.less R resources/ext.popups.desktop/images/footer-ltr.png R resources/ext.popups.desktop/images/footer-ltr.svg R resources/ext.popups.desktop/images/footer-rtl.png R resources/ext.popups.desktop/images/footer-rtl.svg R resources/ext.popups.desktop/images/hovercard.svg R resources/ext.popups.desktop/images/navpop.svg R resources/ext.popups.desktop/popup.mustache R resources/ext.popups.desktop/settings.mustache R resources/ext.popups.renderer.desktopRenderer/desktopRenderer.js R resources/ext.popups.renderer.mobileRenderer/LinkPreview.less R resources/ext.popups.renderer.mobileRenderer/LinkPreviewDrawer.hogan R resources/ext.popups.renderer.mobileRenderer/LinkPreviewDrawer.js R resources/ext.popups.renderer.mobileRenderer/mobileRenderer.js R resources/ext.popups.schemaPopups.utils/ext.popups.schemaPopups.utils.js R resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js R resources/ext.popups.targets.desktopTarget/desktopTarget.js R resources/ext.popups.targets.mobileTarget/mobileTarget.js R tests/qunit/ext.popups.desktopRenderer.test.js 34 files changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups refs/changes/15/316415/1 diff --git a/Popups.hooks.php b/Popups.hooks.php index a0466f0..654a8f4 100644 --- a/Popups.hooks.php +++ b/Popups.hooks.php @@ -30,8 +30,8 @@ 'label-message' => 'popups-message', 'desc-message' => 'popups-desc', 'screenshot' => array( - 'ltr' => "$wgExtensionAssetsPath/Popups/resources/images/popups-ltr.svg", - 'rtl' => "$wgExtensionAssetsPath/Popups/resources/images/popups-rtl.svg", + 'ltr' => "$wgExtensionAssetsPath/Popups/images/popups-ltr.svg", + 'rtl' => "$wgExtensionAssetsPath/Popups/images/popups-rtl.svg", ), 'info-link' => 'https://www.mediawiki.org/wiki/Beta_Features/Hovercards', 'discussion-link' => 'https://www.mediawiki.org/wiki/Talk:Beta_Features/Hovercards', @@ -81,7 +81,7 @@ 'ext.popups.schemaPopups.utils', ], 'scripts' => [ - 'resources/ext.popups.schemaPopups.js', + 'resources/ext.popups.schemaPopups/ext.popups.schemaPopups.js', ] ]; } @@ -90,16 +90,16 @@ $rl->register( "ext.popups.desktop", array( 'scripts' => array( - 'resources/ext.popups.renderer.article.js', - 'resources/ext.popups.settings.js', + 'resources/ext.popups.desktop/ext.popups.renderer.article.js', + 'resources/ext.popups.desktop/ext.popups.settings.js', ), 'templates' => array( - 'popup.mustache' => 'resources/popup.mustache', - 'settings.mustache' => 'resources/settings.mustache', + 'popup.mustache' => 'resources/ext.popups.desktop/popup.mustache', + 'settings
