From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Thu, 25 Sep 2014 16:47:28 +0000 (+0000)
Subject: Merge "Make mediawiki.action.view.dblClickEdit recheck preference"
X-Git-Tag: 1.31.0-rc.0~13822
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=e9c41b239cf67cc258f071586ed201d0bd9ee462;hp=c80218d19393e2ae8d3b61bc4da9ed8c6eb09035;p=lhc%2Fweb%2Fwiklou.git

Merge "Make mediawiki.action.view.dblClickEdit recheck preference"
---

diff --git a/resources/Resources.php b/resources/Resources.php
index b9b2c8d2c2..3bb5b4e53b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1034,6 +1034,7 @@ return array(
 		'dependencies' => array(
 			'mediawiki.util',
 			'mediawiki.page.startup',
+			'user.options',
 		),
 	),
 	'mediawiki.action.view.metadata' => array(
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
index 2ded40cf2f..3c22851e37 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
@@ -4,9 +4,12 @@
 ( function ( mw, $ ) {
 	$( function () {
 		mw.util.$content.dblclick( function ( e ) {
-			e.preventDefault();
-			// Trigger native HTMLElement click instead of opening URL (bug 43052)
-			$( '#ca-edit a' ).get( 0 ).click();
+			// Recheck preference so extensions can do a hack to disable this code.
+			if ( parseInt( mw.user.options.get( 'editondblclick' ), 10 ) ) {
+				e.preventDefault();
+				// Trigger native HTMLElement click instead of opening URL (bug 43052)
+				$( '#ca-edit a' ).get( 0 ).click();
+			}
 		} );
 	} );
 }( mediaWiki, jQuery ) );