Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/65414
Change subject: ResourceLoader: Move arrow icons to a separate module
......................................................................
ResourceLoader: Move arrow icons to a separate module
The arrow icons for the enahnced watchlist/recent changes could be
useful elsewhere. But to do that, we need to be able to load them
separately; this does that by adding a new module just for the CSS
needed for the arrows.
Also, this fixes a use of OutputPage::addModuleStyles that really should
have been OutputPage::addModules so dependencies are resolved.
Change-Id: I639a5ccbc3b7b2794e7b12ecb64e5ee6b10a640a
---
M includes/ChangesList.php
M resources/Resources.php
M resources/mediawiki.special/mediawiki.special.changeslist.css
R resources/mediawiki/images/arrow-collapsed-ltr.png
R resources/mediawiki/images/arrow-collapsed-rtl.png
R resources/mediawiki/images/arrow-expanded.png
A resources/mediawiki/mediawiki.arrows.css
7 files changed, 16 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/14/65414/1
diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 1b6b396..289ad13 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -194,7 +194,7 @@
$this->rcCacheIndex = 0;
$this->lastdate = '';
$this->rclistOpen = false;
- $this->getOutput()->addModuleStyles(
'mediawiki.special.changeslist' );
+ $this->getOutput()->addModules( 'mediawiki.special.changeslist'
);
return '';
}
@@ -711,7 +711,7 @@
$this->rcCacheIndex = 0;
$this->lastdate = '';
$this->rclistOpen = false;
- $this->getOutput()->addModuleStyles(
'mediawiki.special.changeslist' );
+ $this->getOutput()->addModules( 'mediawiki.special.changeslist'
);
return '';
}
/**
@@ -954,7 +954,7 @@
implode( $this->message['semicolon-separator'],
$users )
)->escaped() . '</span>';
- $tl = '<span class="mw-collapsible-toggle
mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space"></span>';
+ $tl = '<span class="mw-collapsible-toggle mw-collapsible-arrow
mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space"></span>';
$r .= "<td>$tl</td>";
# Main line
diff --git a/resources/Resources.php b/resources/Resources.php
index ddcefda..c3e0cb9 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -596,6 +596,9 @@
'user.tokens',
),
),
+ 'mediawiki.arrows' => array(
+ 'styles' => 'resources/mediawiki/mediawiki.arrows.css',
+ ),
'mediawiki.debug' => array(
'scripts' => 'resources/mediawiki/mediawiki.debug.js',
'styles' => 'resources/mediawiki/mediawiki.debug.css',
@@ -902,7 +905,7 @@
),
'mediawiki.special.changeslist' => array(
'styles' =>
'resources/mediawiki.special/mediawiki.special.changeslist.css',
- 'dependencies' => array( 'jquery.makeCollapsible' ),
+ 'dependencies' => array( 'jquery.makeCollapsible',
'mediawiki.arrows' ),
),
'mediawiki.special.movePage' => array(
'scripts' =>
'resources/mediawiki.special/mediawiki.special.movePage.js',
diff --git a/resources/mediawiki.special/mediawiki.special.changeslist.css
b/resources/mediawiki.special/mediawiki.special.changeslist.css
index 3c841e5..7b3740e 100644
--- a/resources/mediawiki.special/mediawiki.special.changeslist.css
+++ b/resources/mediawiki.special/mediawiki.special.changeslist.css
@@ -49,16 +49,6 @@
cursor: pointer;
}
-.mw-enhancedchanges-arrow.mw-collapsible-toggle-collapsed {
- /* @embed */
- background: url(images/arrow-collapsed-ltr.png) no-repeat left bottom;
-}
-
-.mw-enhancedchanges-arrow.mw-collapsible-toggle-expanded {
- /* @embed */
- background: url(images/arrow-expanded.png) no-repeat left bottom;
-}
-
.mw-changeslist-line-watched .mw-title,
.mw-enhanced-watched .mw-enhanced-rc-time {
font-weight: bold;
diff --git a/resources/mediawiki.special/images/arrow-collapsed-ltr.png
b/resources/mediawiki/images/arrow-collapsed-ltr.png
similarity index 100%
rename from resources/mediawiki.special/images/arrow-collapsed-ltr.png
rename to resources/mediawiki/images/arrow-collapsed-ltr.png
Binary files differ
diff --git a/resources/mediawiki.special/images/arrow-collapsed-rtl.png
b/resources/mediawiki/images/arrow-collapsed-rtl.png
similarity index 100%
rename from resources/mediawiki.special/images/arrow-collapsed-rtl.png
rename to resources/mediawiki/images/arrow-collapsed-rtl.png
Binary files differ
diff --git a/resources/mediawiki.special/images/arrow-expanded.png
b/resources/mediawiki/images/arrow-expanded.png
similarity index 100%
rename from resources/mediawiki.special/images/arrow-expanded.png
rename to resources/mediawiki/images/arrow-expanded.png
Binary files differ
diff --git a/resources/mediawiki/mediawiki.arrows.css
b/resources/mediawiki/mediawiki.arrows.css
new file mode 100644
index 0000000..d4b8384
--- /dev/null
+++ b/resources/mediawiki/mediawiki.arrows.css
@@ -0,0 +1,9 @@
+.mw-collapsible-arrow.mw-collapsible-toggle-collapsed {
+ /* @embed */
+ background: url(images/arrow-collapsed-ltr.png) no-repeat left bottom;
+}
+
+.mw-collapsible-arrow.mw-collapsible-toggle-expanded {
+ /* @embed */
+ background: url(images/arrow-expanded.png) no-repeat left bottom;
+}
--
To view, visit https://gerrit.wikimedia.org/r/65414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I639a5ccbc3b7b2794e7b12ecb64e5ee6b10a640a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
