From 5db8be6e7ba130865bae146402e18098e889f7a1 Mon Sep 17 00:00:00 2001
From: Alex Z <mrzman@users.mediawiki.org>
Date: Sat, 25 Oct 2008 02:27:27 +0000
Subject: [PATCH] Re-committing r42514: (bug 16073) * Use onclick handler for
 expand/collapse in enhanced recentchanges. * Hide the expandable content with
 JavaScript for better fallback if JS is disabled for whatever reason. * Move
 enhancedchanges JS to separate file. * Less cryptic id names.

with some tweaks suggested by Brion and Danny B on the bug.
---
 RELEASE-NOTES                     |  2 ++
 includes/ChangesList.php          | 47 ++++++++++++++++++++++---------
 includes/DefaultSettings.php      |  2 +-
 languages/messages/MessagesEn.php |  2 ++
 maintenance/language/messages.inc |  2 ++
 skins/common/enhancedchanges.js   | 39 +++++++++++++++++++++++++
 skins/common/wikibits.js          | 16 -----------
 7 files changed, 79 insertions(+), 31 deletions(-)
 create mode 100644 skins/common/enhancedchanges.js

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1d850d61ff..2735a65b86 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -283,6 +283,8 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 14609) User's namespaces to be searched default not updated after adding new namespace
 * Purge form uses valid XHTML and (bug 8992) uses $wgRequest instead of $_SERVER
 * (bug 12764) Special:LonelyPages shows transcluded pages
+* (bug 16073) Enhanced RecentChanges uses onclick handler with better fallback if
+  JavaScript is disabled.
 
 === API changes in 1.14 ===
 
diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 41d20398b2..f3984b3464 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -388,6 +388,23 @@ class OldChangesList extends ChangesList {
  * Generate a list of changes using an Enhanced system (use javascript).
  */
 class EnhancedChangesList extends ChangesList {
+
+	/**
+	*  Add the JavaScript file for enhanced changeslist
+	*  @ return string
+	*/
+	public function beginRecentChangesList() {
+		global $wgStylePath, $wgStyleVersion;
+		$this->rc_cache = array();
+		$this->rcMoveIndex = 0;
+		$this->rcCacheIndex = 0;
+		$this->lastdate = '';
+		$this->rclistOpen = false;
+		$script = Xml::tags( 'script', array(
+			'type' => 'text/javascript',
+			'src' => $wgStylePath . "/common/enhancedchanges.js?$wgStyleVersion" ), '' );
+		return $script;
+	}
 	/**
 	 * Format a line for enhanced recentchange (aka with javascript and block of lines).
 	 */
@@ -596,13 +613,16 @@ class EnhancedChangesList extends ChangesList {
 
 		$users = ' <span class="changedby">[' . implode( $this->message['semicolon-separator'], $users ) . ']</span>';
 
-		# Arrow
-		$rci = 'RCI'.$this->rcCacheIndex;
-		$rcl = 'RCL'.$this->rcCacheIndex;
-		$rcm = 'RCM'.$this->rcCacheIndex;
-		$toggleLink = "javascript:toggleVisibility('$rci','$rcm','$rcl')";
-		$tl  = '<span id="'.$rcm.'"><a href="'.$toggleLink.'">' . $this->sideArrow() . '</a></span>';
-		$tl .= '<span id="'.$rcl.'" style="display:none"><a href="'.$toggleLink.'">' . $this->downArrow() . '</a></span>';
+		# ID for JS visibility toggle
+		$jsid = $this->rcCacheIndex;
+		# onclick handler to toggle hidden/expanded
+		$toggleLink = "onclick='toggleVisibility($jsid)'";
+		# Title for <a> tags
+		$expandTitle = wfMsg('rc-enhanced-expand');
+		$closeTitle = wfMsg('rc-enhanced-hide');
+
+		$tl  = "<span id='mw-rc-openarrow-$jsid' class='mw-changeslist-expanded'><a href='#' $toggleLink title='$expandTitle'>" . $this->sideArrow() . "</a></span>";
+		$tl .= "<span id='mw-rc-closearrow-$jsid' class='mw-changeslist-hidden' style='display:none'><a href='#' $toggleLink title='$closeTitle'>" . $this->downArrow() . "</a></span>";
 		$r .= '<td valign="top" style="white-space: nowrap"><tt>'.$tl.'&nbsp;';
 
 		# Main line
@@ -680,7 +700,7 @@ class EnhancedChangesList extends ChangesList {
 		$r .= "</td></tr></table>\n";
 
 		# Sub-entries
-		$r .= '<div id="'.$rci.'" style="display:none;"><table cellpadding="0" cellspacing="0"  border="0" style="background: none">';
+		$r .= '<div id="mw-rc-subentries-'.$jsid.'" class="mw-changeslist-hidden"><table cellpadding="0" cellspacing="0"  border="0" style="background: none">';
 		foreach( $block as $rcObj ) {
 			# Get rc_xxxx variables
 			// FIXME: Would be good to replace this extract() call with something that explicitly initializes local variables.
@@ -759,11 +779,10 @@ class EnhancedChangesList extends ChangesList {
 	 * @param string $alt text
 	 * @return string HTML <img> tag
 	 */
-	protected function arrow( $dir, $alt='' ) {
+	protected function arrow( $dir ) {
 		global $wgStylePath;
 		$encUrl = htmlspecialchars( $wgStylePath . '/common/images/Arr_' . $dir . '.png' );
-		$encAlt = htmlspecialchars( $alt );
-		return "<img src=\"$encUrl\" width=\"12\" height=\"12\" alt=\"$encAlt\" />";
+		return "<img src=\"$encUrl\" width=\"12\" height=\"12\" />";
 	}
 
 	/**
@@ -774,7 +793,7 @@ class EnhancedChangesList extends ChangesList {
 	protected function sideArrow() {
 		global $wgContLang;
 		$dir = $wgContLang->isRTL() ? 'l' : 'r';
-		return $this->arrow( $dir, '+' );
+		return $this->arrow( $dir );
 	}
 
 	/**
@@ -783,7 +802,7 @@ class EnhancedChangesList extends ChangesList {
 	 * @return string HTML <img> tag
 	 */
 	protected function downArrow() {
-		return $this->arrow( 'd', '-' );
+		return $this->arrow( 'd' );
 	}
 
 	/**
@@ -791,7 +810,7 @@ class EnhancedChangesList extends ChangesList {
 	 * @return string HTML <img> tag
 	 */
 	protected function spacerArrow() {
-		return $this->arrow( '', ' ' );
+		return $this->arrow( '' );
 	}
 
 	/**
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6607e4d37c..b7b698c566 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1385,7 +1385,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '182';
+$wgStyleVersion = '183';
 
 
 # Server-side caching:
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index d03141e2b7..1b7ed87487 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1726,6 +1726,8 @@ please see math/README to configure.',
 'rc_categories_any'                 => 'Any',
 'rc-change-size'                    => '$1', # only translate this message to other languages if you have to change it
 'newsectionsummary'                 => '/* $1 */ new section',
+'rc-enhanced-expand'                => 'Show details (requires JavaScript)',
+'rc-enhanced-hide'                  => 'Hide details',
 
 # Recent changes linked
 'recentchangeslinked'          => 'Related changes',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index aba7ecf433..75de059d48 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1050,6 +1050,8 @@ $wgMessageStructure = array(
 		'rc_categories_any',
 		'rc-change-size',
 		'newsectionsummary',
+		'rc-enhanced-expand',
+		'rc-enhanced-hide',
 	),
 	'recentchangeslinked' => array(
 		'recentchangeslinked',
diff --git a/skins/common/enhancedchanges.js b/skins/common/enhancedchanges.js
new file mode 100644
index 0000000000..ebbcf5b673
--- /dev/null
+++ b/skins/common/enhancedchanges.js
@@ -0,0 +1,39 @@
+/* 
+  JavaScript file for enhanced recentchanges
+ */
+ 
+/*
+  * Add the CSS to hide parts that should be collapsed
+  *
+  * We do this with JS so everything will be expanded by default
+  * if JS is disabled
+ */
+appendCSS('.mw-changeslist-hidden {'+
+	'	display:none;'+
+	'}'+
+	'div.mw-changeslist-expanded {'+
+	'	display:block;'+
+	'}'+
+	'span.mw-changeslist-expanded {'+
+	'	display:inline !important;'+
+	'}'
+);
+
+/*
+ * Switch an RC line between hidden/shown
+ * @param int idNumber : the id number of the RC group
+*/ 
+function toggleVisibility(idNumber) {
+	var openarrow = document.getElementById("mw-rc-openarrow-"+idNumber);
+	var closearrow = document.getElementById("mw-rc-closearrow-"+idNumber);
+	var subentries = document.getElementById("mw-rc-subentries-"+idNumber);
+	if (openarrow.className == 'mw-changeslist-expanded') {
+		openarrow.className = 'mw-changeslist-hidden';
+		closearrow.className = 'mw-changeslist-expanded';
+		subentries.className = 'mw-changeslist-expanded';
+	} else {
+		openarrow.className = 'mw-changeslist-expanded';
+		closearrow.className = 'mw-changeslist-hidden';
+		subentries.className = 'mw-changeslist-hidden';
+	}
+}
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 514714d3da..62ef574842 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -104,22 +104,6 @@ if (wgBreakFrames) {
 	}
 }
 
-// for enhanced RecentChanges
-function toggleVisibility(_levelId, _otherId, _linkId) {
-	var thisLevel = document.getElementById(_levelId);
-	var otherLevel = document.getElementById(_otherId);
-	var linkLevel = document.getElementById(_linkId);
-	if (thisLevel.style.display == 'none') {
-		thisLevel.style.display = 'block';
-		otherLevel.style.display = 'none';
-		linkLevel.style.display = 'inline';
-	} else {
-		thisLevel.style.display = 'none';
-		otherLevel.style.display = 'inline';
-		linkLevel.style.display = 'none';
-	}
-}
-
 function showTocToggle() {
 	if (document.createTextNode) {
 		// Uses DOM calls to avoid document.write + XHTML issues
-- 
2.20.1