From: Krinkle <krinkle@users.mediawiki.org>
Date: Fri, 8 Jul 2011 21:27:44 +0000 (+0000)
Subject: Reverting r91756 per CR and bug 26470
X-Git-Tag: 1.31.0-rc.0~28976
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=9d3237c9df67bfa8af9685708b6ab515c4852a37;p=lhc%2Fweb%2Fwiklou.git

Reverting r91756 per CR and bug 26470
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 82d082a339..546002ed95 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2308,11 +2308,8 @@ $templates
 			$this->getTitle()->getNamespace() != NS_SPECIAL &&
 			in_array( $action, array( 'view', 'purge' ) ) &&
 			$this->getUser()->getOption( 'editondblclick' )
-		)
-		{
-			$editUrl = $this->getTitle()->getLocalUrl( $sk->editUrlOptions() );
-			$bodyAttrs['ondblclick'] = "document.location = '" .
-				Xml::escapeJsString( $editUrl ) . "'";
+		) {
+			$this->addModules( 'mediawiki.action.view.dblClickEdit' );
 		}
 
 		# Classes for LTR/RTL directionality support
diff --git a/resources/Resources.php b/resources/Resources.php
index f2692dc1b2..4861dd2016 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -502,6 +502,9 @@ 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 a949d3a25d..3907a5f45c 100644
--- a/resources/mediawiki.action/mediawiki.action.history.diff.css
+++ b/resources/mediawiki.action/mediawiki.action.history.diff.css
@@ -31,6 +31,7 @@ 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
new file mode 100644
index 0000000000..8650dc892b
--- /dev/null
+++ b/resources/mediawiki.action/mediawiki.action.view.dblClickEdit.js
@@ -0,0 +1,12 @@
+/*
+ * 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 3f9d419607..a448e3e105 100644
--- a/skins/common/shared.css
+++ b/skins/common/shared.css
@@ -95,15 +95,6 @@ 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;