jenkins-bot has submitted this change and it was merged.
Change subject: EventEmitter: Remove redundant 'if' statement in off()
......................................................................
EventEmitter: Remove redundant 'if' statement in off()
This was added when we fixed a bug in disconnect() where it
threw due to accessing an undefined property if there were no
events bound yet.
However, off(), unlike disconnect(), never had this bug. The 'if'
statement is redundant as the 'delete' operator checks this
already. We don't use its return value either (which is true/false
for whether it deleted something).
Increases code coverage by removing implicit 'else' branches that
were never ran.
Change-Id: I40cba9292ad851757fc2a605f0ddc66df0ea173f
---
M src/EventEmitter.js
M test/unit/EventEmitter.test.js
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/EventEmitter.js b/src/EventEmitter.js
index f3be3ae..4849d10 100644
--- a/src/EventEmitter.js
+++ b/src/EventEmitter.js
@@ -84,9 +84,7 @@
if ( arguments.length === 1 ) {
// Remove all bindings for event
- if ( event in this.bindings ) {
- delete this.bindings[event];
- }
+ delete this.bindings[event];
} else {
if ( typeof callback !== 'function' ) {
throw new Error( 'Invalid callback. Function expected.'
);
diff --git a/test/unit/EventEmitter.test.js b/test/unit/EventEmitter.test.js
index 6a10b5b..361b857 100644
--- a/test/unit/EventEmitter.test.js
+++ b/test/unit/EventEmitter.test.js
@@ -105,7 +105,7 @@
ee.emit( 'dataParams', data2A, data2B, data2C );
} );
- QUnit.test( 'off', 2, function ( assert ) {
+ QUnit.test( 'off', 3, function ( assert ) {
var hits, callback,
ee = new oo.EventEmitter();
@@ -135,6 +135,9 @@
ee.emit( 'fn' );
assert.equal( hits, 2, 'Callback unbound after unbinding with
function reference' );
+
+ ee.off( 'unknown' );
+ assert.ok( true, 'Unbinding an unknown event does not fail' );
} );
QUnit.test( 'connect', 2, function ( assert ) {
--
To view, visit https://gerrit.wikimedia.org/r/141960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40cba9292ad851757fc2a605f0ddc66df0ea173f
Gerrit-PatchSet: 4
Gerrit-Project: oojs/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
