From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Sun, 22 Dec 2013 01:01:14 +0000 (+0100)
Subject: Changes list legend modules cleanup
X-Git-Tag: 1.31.0-rc.0~17164^2~2
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=2ec4ed4711f44c565804132c6a5d40344e47e42f;p=lhc%2Fweb%2Fwiklou.git

Changes list legend modules cleanup

The legend is not part of the ChangesList itself, but a part of the
ChangesListSpecialPage; move around modules and calls appropriately.

Followup to I02f2ced4.

Change-Id: I2c8922135404aab1960158cee06e2d8d07a1ace7
---

diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 107e2c4728..470b150c6c 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -161,7 +161,6 @@ class ChangesList extends ContextSource {
 		$this->lastdate = '';
 		$this->rclistOpen = false;
 		$this->getOutput()->addModuleStyles( 'mediawiki.special.changeslist' );
-		$this->getOutput()->addModules( 'mediawiki.special.changeslist.js' );
 
 		return '<div class="mw-changeslist">';
 	}
diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php
index cc299a9b0f..df60f021b0 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -41,7 +41,6 @@ class EnhancedChangesList extends ChangesList {
 		$this->getOutput()->addModules( array(
 			'jquery.makeCollapsible',
 			'mediawiki.icon',
-			'mediawiki.special.changeslist.js',
 		) );
 
 		return '<div class="mw-changeslist">';
diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index cedd49c0e7..78143595cc 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -282,9 +282,9 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 	 */
 	protected function addModules() {
 		$out = $this->getOutput();
-		// These modules include styles and behavior for the legend box, load them unconditionally
-		$out->addModuleStyles( 'mediawiki.special.changeslist' );
-		$out->addModules( 'mediawiki.special.changeslist.js' );
+		// Styles and behavior for the legend box (see makeLegend())
+		$out->addModuleStyles( 'mediawiki.special.changeslist.legend' );
+		$out->addModules( 'mediawiki.special.changeslist.legend.js' );
 	}
 
 	protected function getGroupName() {
diff --git a/resources/Resources.php b/resources/Resources.php
index 01d4a3f136..2f8f662621 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1080,8 +1080,11 @@ return array(
 	'mediawiki.special.changeslist' => array(
 		'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
 	),
-	'mediawiki.special.changeslist.js' => array(
-		'scripts' => 'resources/mediawiki.special/mediawiki.special.changeslist.js',
+	'mediawiki.special.changeslist.legend' => array(
+		'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.legend.css',
+	),
+	'mediawiki.special.changeslist.legend.js' => array(
+		'scripts' => 'resources/mediawiki.special/mediawiki.special.changeslist.legend.js',
 		'dependencies' => array(
 			'jquery.makeCollapsible',
 			'jquery.cookie',
diff --git a/resources/mediawiki.special/mediawiki.special.changeslist.css b/resources/mediawiki.special/mediawiki.special.changeslist.css
index 6cb94e7133..5e4af7b686 100644
--- a/resources/mediawiki.special/mediawiki.special.changeslist.css
+++ b/resources/mediawiki.special/mediawiki.special.changeslist.css
@@ -5,29 +5,3 @@
 .mw-changeslist-line-watched .mw-title {
 	font-weight: bold;
 }
-
-.mw-changeslist-legend {
-	float: right;
-	margin-left: 1em;
-	margin-bottom: 0.5em;
-	clear: right;
-	font-size: 85%;
-	line-height: 1.2em;
-	padding: 0.5em;
-	border: 1px solid #ddd;
-}
-
-.mw-changeslist-legend dl {
-	/* Parent element defines sufficient padding */
-	margin-bottom: 0;
-}
-
-.mw-changeslist-legend dt {
-	float: left;
-	margin-right: 0.5em;
-}
-
-.mw-changeslist-legend dd {
-	margin-left: 1.5em;
-	line-height: 1.3em;
-}
diff --git a/resources/mediawiki.special/mediawiki.special.changeslist.js b/resources/mediawiki.special/mediawiki.special.changeslist.js
deleted file mode 100644
index df606f5c53..0000000000
--- a/resources/mediawiki.special/mediawiki.special.changeslist.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Remember the collapse state of the legend on recent changes and watchlist pages. */
-jQuery( document ).ready( function ( $ ) {
-	var
-		cookieName = 'changeslist-state',
-		cookieOptions = {
-			expires: 30,
-			path: '/'
-		},
-		isCollapsed = $.cookie( cookieName ) === 'collapsed';
-
-	$( '.mw-changeslist-legend' )
-		.makeCollapsible( {
-			collapsed: isCollapsed
-		} )
-		.on( 'beforeExpand.mw-collapsible', function () {
-			$.cookie( cookieName, 'expanded', cookieOptions );
-		} )
-		.on( 'beforeCollapse.mw-collapsible', function () {
-			$.cookie( cookieName, 'collapsed', cookieOptions );
-		} );
-} );
diff --git a/resources/mediawiki.special/mediawiki.special.changeslist.legend.css b/resources/mediawiki.special/mediawiki.special.changeslist.legend.css
new file mode 100644
index 0000000000..54d09b4fbf
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.changeslist.legend.css
@@ -0,0 +1,29 @@
+/**
+ * Styling for changes list legend
+ */
+
+.mw-changeslist-legend {
+	float: right;
+	margin-left: 1em;
+	margin-bottom: 0.5em;
+	clear: right;
+	font-size: 85%;
+	line-height: 1.2em;
+	padding: 0.5em;
+	border: 1px solid #ddd;
+}
+
+.mw-changeslist-legend dl {
+	/* Parent element defines sufficient padding */
+	margin-bottom: 0;
+}
+
+.mw-changeslist-legend dt {
+	float: left;
+	margin-right: 0.5em;
+}
+
+.mw-changeslist-legend dd {
+	margin-left: 1.5em;
+	line-height: 1.3em;
+}
diff --git a/resources/mediawiki.special/mediawiki.special.changeslist.legend.js b/resources/mediawiki.special/mediawiki.special.changeslist.legend.js
new file mode 100644
index 0000000000..0259155837
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.changeslist.legend.js
@@ -0,0 +1,25 @@
+/**
+ * Script for changes list legend
+ */
+
+/* Remember the collapse state of the legend on recent changes and watchlist pages. */
+jQuery( document ).ready( function ( $ ) {
+	var
+		cookieName = 'changeslist-state',
+		cookieOptions = {
+			expires: 30,
+			path: '/'
+		},
+		isCollapsed = $.cookie( cookieName ) === 'collapsed';
+
+	$( '.mw-changeslist-legend' )
+		.makeCollapsible( {
+			collapsed: isCollapsed
+		} )
+		.on( 'beforeExpand.mw-collapsible', function () {
+			$.cookie( cookieName, 'expanded', cookieOptions );
+		} )
+		.on( 'beforeCollapse.mw-collapsible', function () {
+			$.cookie( cookieName, 'collapsed', cookieOptions );
+		} );
+} );