From 79e045e13993dca9ddade982b9abd392179d59d5 Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Fri, 8 Jul 2011 21:28:54 +0000
Subject: [PATCH] Selfrevert r91759. Messed up working-copy

---
 includes/OutputPage.php                              |  7 +++++--
 resources/Resources.php                              |  3 ---
 .../mediawiki.action.history.diff.css                |  1 -
 .../mediawiki.action.view.dblClickEdit.js            | 12 ------------
 skins/common/shared.css                              |  9 +++++++++
 5 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 resources/mediawiki.action/mediawiki.action.view.dblClickEdit.js

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 546002ed95..82d082a339 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2308,8 +2308,11 @@ $templates
 			$this->getTitle()->getNamespace() != NS_SPECIAL &&
 			in_array( $action, array( 'view', 'purge' ) ) &&
 			$this->getUser()->getOption( 'editondblclick' )
-		) {
-			$this->addModules( 'mediawiki.action.view.dblClickEdit' );
+		)
+		{
+			$editUrl = $this->getTitle()->getLocalUrl( $sk->editUrlOptions() );
+			$bodyAttrs['ondblclick'] = "document.location = '" .
+				Xml::escapeJsString( $editUrl ) . "'";
 		}
 
 		# Classes for LTR/RTL directionality support
diff --git a/resources/Resources.php b/resources/Resources.php
index 4861dd2016..f2692dc1b2 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -502,9 +502,6 @@ return array(
 			'jquery.byteLimit',
 		),
 	),
-	'mediawiki.action.view.dblClickEdit' => array(
-		'scripts' => 'resources/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
-	),
 	'mediawiki.action.view.rightClickEdit' => array(
 		'scripts' => 'resources/mediawiki.action/mediawiki.action.view.rightClickEdit.js',
 	),
diff --git a/resources/mediawiki.action/mediawiki.action.history.diff.css b/resources/mediawiki.action/mediawiki.action.history.diff.css
index 3907a5f45c..a949d3a25d 100644
--- a/resources/mediawiki.action/mediawiki.action.history.diff.css
+++ b/resources/mediawiki.action/mediawiki.action.history.diff.css
@@ -31,7 +31,6 @@ td.diff-context {
 	font-weight: bold;
 	white-space: -moz-pre-wrap;
 	white-space: pre-wrap;
-	text-decoration: none;
 }
 
 table.diff {
diff --git a/resources/mediawiki.action/mediawiki.action.view.dblClickEdit.js b/resources/mediawiki.action/mediawiki.action.view.dblClickEdit.js
deleted file mode 100644
index 8650dc892b..0000000000
--- a/resources/mediawiki.action/mediawiki.action.view.dblClickEdit.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * This module enables double-click-to-edit functionality
- */
-jQuery( function( $ ) {
-	var url = $('#ca-edit a').attr('href');
-	if ( url ) {
-		mw.util.$content.dblclick( function( e ) {
-			e.preventDefault();
-			window.location = url;
-		} );
-	}
-} );
diff --git a/skins/common/shared.css b/skins/common/shared.css
index a448e3e105..3f9d419607 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -95,6 +95,15 @@ h2#filehistory {
 	clear: both;
 }
 
+/*
+* Add a checkered background image on hover for file description pages. Bug 26470
+*/
+.filehistory a img:hover,
+#file img:hover {
+    /* @embed */
+    background: white url(images/Checker-16x16.png) repeat;
+}
+
 table.filehistory th,
 table.filehistory td {
 	vertical-align: top;
-- 
2.20.1