From a6b402c1c3ab0088c3c2c99ee694007ab5f9b445 Mon Sep 17 00:00:00 2001 From: Leszek Manicki Date: Wed, 31 Aug 2016 10:14:48 +0200 Subject: [PATCH] Rename mediawiki.action.history.diff to mediawiki.diff.styles Diff is not shown on action=history, so the name was not valid. This module contains only styles, so let's make it explicit in its name too. mediawiki.action.history.diff module is temporarily left for backwards compatibility. It should be removed when no longer used. This also renames docs/uidesign/mediawiki.action.history.diff.html to docs/uidesign/mediawiki.diff.html. Change-Id: I7ecc08417c5f1870ed6f2ca139fd953d68f6ec8e --- ...on.history.diff.html => mediawiki.diff.html} | 8 ++++---- includes/diff/DifferenceEngine.php | 4 ++-- resources/Resources.php | 17 ++++++++++++++--- .../mediawiki.diff.styles.css} | 0 .../mediawiki.diff.styles.print.css} | 0 5 files changed, 20 insertions(+), 9 deletions(-) rename docs/uidesign/{mediawiki.action.history.diff.html => mediawiki.diff.html} (88%) rename resources/src/{mediawiki.action/mediawiki.action.history.diff.css => mediawiki/mediawiki.diff.styles.css} (100%) rename resources/src/{mediawiki.action/mediawiki.action.history.diff.print.css => mediawiki/mediawiki.diff.styles.print.css} (100%) diff --git a/docs/uidesign/mediawiki.action.history.diff.html b/docs/uidesign/mediawiki.diff.html similarity index 88% rename from docs/uidesign/mediawiki.action.history.diff.html rename to docs/uidesign/mediawiki.diff.html index 615558f206..0372595ce9 100644 --- a/docs/uidesign/mediawiki.action.history.diff.html +++ b/docs/uidesign/mediawiki.diff.html @@ -2,14 +2,14 @@ - - + + -

This show various styles for our diff action. Style sheet: resources/src/mediawiki.action/mediawiki.action.history.diff.css.

This show various styles for our diff action. Style sheet: resources/src/mediawiki/mediawiki.diff.styles.css.

This file might help us fix our diff colors which have been a recurring issues among the community for a loooong time.

Try it out in print mode, too. Style sheet: resources/src/mediawiki.action/mediawiki.action.history.diff.print.css.

Try it out in print mode, too. Style sheet: resources/src/mediawiki/mediawiki.diff.styles.print.css.

Practical example copied from MediaWiki's HTML output:

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index baec396ed0..6fada55974 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -695,10 +695,10 @@ class DifferenceEngine extends ContextSource { } /** - * Add style sheets and supporting JS for diff display. + * Add style sheets for diff display. */ public function showDiffStyle() { - $this->getOutput()->addModuleStyles( 'mediawiki.action.history.diff' ); + $this->getOutput()->addModuleStyles( 'mediawiki.diff.styles' ); } /** diff --git a/resources/Resources.php b/resources/Resources.php index ef56cd340a..2d8d3a014f 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -988,6 +988,16 @@ return [ // must be loaded on the bottom 'position' => 'bottom', ], + 'mediawiki.diff.styles' => [ + 'position' => 'top', + 'styles' => [ + 'resources/src/mediawiki/mediawiki.diff.styles.css', + 'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [ + 'media' => 'print' + ], + ], + 'targets' => [ 'desktop', 'mobile' ], + ], 'mediawiki.feedback' => [ 'scripts' => 'resources/src/mediawiki/mediawiki.feedback.js', 'styles' => 'resources/src/mediawiki/mediawiki.feedback.css', @@ -1483,7 +1493,7 @@ return [ 'jquery.spinner', 'jquery.textSelection', 'mediawiki.api', - 'mediawiki.action.history.diff', + 'mediawiki.diff.styles', 'mediawiki.util', 'mediawiki.jqueryMsg', ], @@ -1510,11 +1520,12 @@ return [ 'position' => 'top', 'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css', ], + // using this module is deprecated, for diff styles use mediawiki.diff.styles instead 'mediawiki.action.history.diff' => [ 'position' => 'top', 'styles' => [ - 'resources/src/mediawiki.action/mediawiki.action.history.diff.css', - 'resources/src/mediawiki.action/mediawiki.action.history.diff.print.css' => [ + 'resources/src/mediawiki/mediawiki.diff.styles.css', + 'resources/src/mediawiki/mediawiki.diff.styles.print.css' => [ 'media' => 'print' ], ], diff --git a/resources/src/mediawiki.action/mediawiki.action.history.diff.css b/resources/src/mediawiki/mediawiki.diff.styles.css similarity index 100% rename from resources/src/mediawiki.action/mediawiki.action.history.diff.css rename to resources/src/mediawiki/mediawiki.diff.styles.css diff --git a/resources/src/mediawiki.action/mediawiki.action.history.diff.print.css b/resources/src/mediawiki/mediawiki.diff.styles.print.css similarity index 100% rename from resources/src/mediawiki.action/mediawiki.action.history.diff.print.css rename to resources/src/mediawiki/mediawiki.diff.styles.print.css -- 2.20.1