Follow-up #186: Actually merge no-undelegate into no-delegate

Part of #163
wikimedia · Mar 16, 2020 · 973bf5b · 973bf5b
1 parent 1d899ad
commit 973bf5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/docs/no-delegate.md b/docs/no-delegate.md
@@ -1,6 +1,6 @@
 # no-delegate
 
-Disallows the `.delegate` method. Prefer `$.on`/`EventTarget#addEventListener` to `$.delegate`.
+Disallows the `.delegate`/`.undelegate` methods. Prefer `$.on`/`$.off` or `EventTarget#addEventListener`/`removeEventListener`.
 
 This rule is enabled in `plugin:no-jquery/deprecated-3.0`.
 

diff --git a/rules/no-delegate.js b/rules/no-delegate.js
@@ -3,6 +3,11 @@
 const utils = require( './utils.js' );
 
 module.exports = utils.createCollectionMethodRule(
-	'delegate',
-	'Prefer `$.on`/`EventTarget#addEventListener` to `$.delegate`'
+	[ 'delegate', 'undelegate' ],
+	( node ) => node === true ?
+		'Prefer `$.on`/`$.off` or `EventTarget#addEventListener`/`removeEventListener`' : (
+			node.callee.property.name === 'delegate' ?
+				'Prefer $.on/EventTarget#addEventListener to $.delegate' :
+				'Prefer $.off/EventTarget#removeEventListener to $.undelegate'
+		)
 );
diff --git a/test-all/methods.js b/test-all/methods.js
@@ -213,7 +213,7 @@ $x.toggleClass();
 $x.trigger();
 // eslint-disable-next-line rulesdir/no-bind, rulesdir/no-unbind
 $x.unbind();
-// eslint-disable-next-line rulesdir/no-undelegate
+// eslint-disable-next-line rulesdir/no-delegate, rulesdir/no-undelegate
 $x.undelegate();
 // eslint-disable-next-line rulesdir/no-wrap
 $x.unwrap();