From 9b41a5dca63d5b6ad4b954323843a5feb0279a32 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Mon, 21 Jul 2008 02:47:42 +0000
Subject: [PATCH] * The accesskey to edit a page is now disabled when editing
 the page, to prevent conflicts with Safari shortcuts (Ctrl-E = go to end of
 line). * Fix watch checkbox for real in Firefox 3.  It still wasn't working
 right, due to the duplicate use of the W accesskey for the watch/unwatch tab.
  This is now disabled on edit.

---
 RELEASE-NOTES      |  2 ++
 skins/Modern.php   | 27 +++++++++++++++++++++------
 skins/MonoBook.php | 30 +++++++++++++++++++++++-------
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 740d874d38..54ffea4a69 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -445,6 +445,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12441) ./maintenance/generateSitemap.php fix -fspath requiring
   a trailing slash.
 * (bug 12568) configuration script now produce valid XHTML.
+* The accesskey to edit a page is now disabled when editing the page, to pre-
+  vent conflicts with Safari shortcuts.
 
 === API changes in 1.13 ===
 
diff --git a/skins/Modern.php b/skins/Modern.php
index e75e4ae829..3f5ce5e8b5 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -110,12 +110,27 @@ class ModernTemplate extends QuickTemplate {
 		<h5><?php $this->msg('views') ?></h5>
 		<div class="pBody">
 			<ul>
-	<?php			foreach($this->data['content_actions'] as $key => $tab) { ?>
-				 <li id="ca-<?php echo Sanitizer::escapeId($key) ?>"<?php
-					 	if($tab['class']) { ?> class="<?php echo htmlspecialchars($tab['class']) ?>"<?php }
-					 ?>><a href="<?php echo htmlspecialchars($tab['href']) ?>"<?php echo $skin->tooltipAndAccesskey('ca-'.$key) ?>><?php
-					 echo htmlspecialchars($tab['text']) ?></a></li>
-	<?php			 } ?>
+	<?php		foreach($this->data['content_actions'] as $key => $tab) {
+					echo '
+				 <li id="ca-' . Sanitizer::escapeId($key).'"';
+					if( $tab['class'] ) {
+						echo ' class="'.htmlspecialchars($tab['class']).'"';
+					}
+					echo'><a href="'.htmlspecialchars($tab['href']).'"';
+					# We don't want to give the watch tab an accesskey if the
+					# page is being edited, because that conflicts with the
+					# accesskey on the watch checkbox.  We also don't want to
+					# give the edit tab an accesskey, because that's fairly su-
+					# perfluous and conflicts with an accesskey (Ctrl-E) often
+					# used for editing in Safari.
+				 	if( in_array( $action, array( 'edit', 'submit' ) )
+				 	&& in_array( $key, array( 'edit', 'watch', 'unwatch' ))) {
+				 		echo $skin->tooltip( "ca-$key" );
+				 	} else {
+				 		echo $skin->tooltipAndAccesskey( "ca-$key" );
+				 	}
+				 	echo '>'.htmlspecialchars($tab['text']).'</a></li>';
+				} ?>
 			</ul>
 		</div>
 	</div>
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index bfd94d5cc0..c17fc71a40 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -46,8 +46,9 @@ class MonoBookTemplate extends QuickTemplate {
 	 * @access private
 	 */
 	function execute() {
-		global $wgUser;
+		global $wgUser, $wgRequest;
 		$this->skin = $skin = $wgUser->getSkin();
+		$action = $wgRequest->getText( 'action' );
 
 		// Suppress warnings to prevent notices about missing indexes in $this->data
 		wfSuppressWarnings();
@@ -123,12 +124,27 @@ class MonoBookTemplate extends QuickTemplate {
 		<h5><?php $this->msg('views') ?></h5>
 		<div class="pBody">
 			<ul>
-	<?php			foreach($this->data['content_actions'] as $key => $tab) { ?>
-				 <li id="ca-<?php echo Sanitizer::escapeId($key) ?>"<?php
-					 	if($tab['class']) { ?> class="<?php echo htmlspecialchars($tab['class']) ?>"<?php }
-					 ?>><a href="<?php echo htmlspecialchars($tab['href']) ?>"<?php echo $skin->tooltipAndAccesskey('ca-'.$key) ?>><?php
-					 echo htmlspecialchars($tab['text']) ?></a></li>
-	<?php			 } ?>
+	<?php		foreach($this->data['content_actions'] as $key => $tab) {
+					echo '
+				 <li id="ca-' . Sanitizer::escapeId($key).'"';
+					if( $tab['class'] ) {
+						echo ' class="'.htmlspecialchars($tab['class']).'"';
+					}
+					echo'><a href="'.htmlspecialchars($tab['href']).'"';
+					# We don't want to give the watch tab an accesskey if the
+					# page is being edited, because that conflicts with the
+					# accesskey on the watch checkbox.  We also don't want to
+					# give the edit tab an accesskey, because that's fairly su-
+					# perfluous and conflicts with an accesskey (Ctrl-E) often
+					# used for editing in Safari.
+				 	if( in_array( $action, array( 'edit', 'submit' ) )
+				 	&& in_array( $key, array( 'edit', 'watch', 'unwatch' ))) {
+				 		echo $skin->tooltip( "ca-$key" );
+				 	} else {
+				 		echo $skin->tooltipAndAccesskey( "ca-$key" );
+				 	}
+				 	echo '>'.htmlspecialchars($tab['text']).'</a></li>';
+				} ?>
 			</ul>
 		</div>
 	</div>
-- 
2.20.1