resources: Merge dblClickEdit and rightClickEdit JS code

Both are rare preferences that are off by default and have no active steward.

They are small enough that it isn't worth creating and registering public bundle
for on all page views for all users. Instead, combine them into a single module.

Bug: T233676
Change-Id: I21a492ad8b6005c1bd9257599cd19b594fc3d263

3 files changed, 27 insertions, 23 deletions

diff --git a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
deleted file mode 100644
index f2e07d892ba9..000000000000
--- a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*!
- * Enables double-click-to-edit functionality.
- */
-( function () {
-	$( function () {
-		mw.util.$content.on( 'dblclick', function ( e ) {
-			var $a;
-			// Recheck preference so extensions can do a hack to disable this code.
-			if ( parseInt( mw.user.options.get( 'editondblclick' ), 10 ) ) {
-				// Trigger native HTMLElement click instead of opening URL (T45052)
-				$a = $( '#ca-edit a' );
-				// Not every page has an edit link (T59713)
-				if ( $a.length ) {
-					e.preventDefault();
-					$a.get( 0 ).click();
-				}
-			}
-		} );
-	} );
-}() );
diff --git a/resources/src/mediawiki.misc-authed-pref/dblClickEdit.js b/resources/src/mediawiki.misc-authed-pref/dblClickEdit.js
new file mode 100644
index 000000000000..6815433af689
--- /dev/null
+++ b/resources/src/mediawiki.misc-authed-pref/dblClickEdit.js
@@ -0,0 +1,19 @@
+/*!
+ * Enable double-click-to-edit functionality.
+ */
+( function () {
+	if ( !parseInt( mw.user.options.get( 'editondblclick' ), 10 ) ) {
+		return;
+	}
+	$( function () {
+		$( '#mw-content-text' ).on( 'dblclick', function ( e ) {
+			// Trigger native HTMLElement click instead of opening URL (T45052)
+			var $a = $( '#ca-edit a' );
+			// Not every page has an edit link (T59713)
+			if ( $a.length ) {
+				e.preventDefault();
+				$a.get( 0 ).click();
+			}
+		} );
+	} );
+}() );
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js b/resources/src/mediawiki.misc-authed-pref/rightClickEdit.js
index 59d1d4f3fe62..8c936eb39cd6 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.rightClickEdit.js
+++ b/resources/src/mediawiki.misc-authed-pref/rightClickEdit.js
@@ -1,9 +1,14 @@
 /*!
- * JavaScript to enable right click edit functionality.
- * When the user right-clicks in a heading, it will open the
- * edit screen.
+ * Enable right-click-to-edit functionality.
+ *
+ * When the user right-clicks in a content heading, it will open the
+ * edit section link.
  */
 ( function () {
+	if ( !parseInt( mw.user.options.get( 'editsectiononrightclick' ), 10 ) ) {
+		return;
+	}
+
 	// Trigger this when a contextmenu click on the page targets an h1-h6 element.
 	// This uses a delegate handler which 1) starts immediately instead of blocking
 	// response on dom-ready, and 2) selects and binds once instead of N times.