Skip to content

Commit

Permalink
timers: cleanup interval handling
Browse files Browse the repository at this point in the history
Uses `null` as the false-y value for `_repeat` as like other properties.
Removes un-reachable statement in setInterval’s `wrapper()`.

PR-URL: #1272
Reviewed-by: Trevor Norris <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
  • Loading branch information
Fishrock123 committed Mar 26, 2015
1 parent caf0b36 commit 776b73b
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions lib/timers.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,6 @@ exports.setInterval = function(callback, repeat) {

function wrapper() {
timer._repeat.call(this);
// If callback called clearInterval().
if (timer._repeat === null) return;
// If timer is unref'd (or was - it's permanently removed from the list.)
if (this._handle) {
this._handle.start(repeat, 0);
Expand All @@ -287,7 +285,7 @@ exports.setInterval = function(callback, repeat) {

exports.clearInterval = function(timer) {
if (timer && timer._repeat) {
timer._repeat = false;
timer._repeat = null;
clearTimeout(timer);
}
};
Expand All @@ -300,7 +298,7 @@ const Timeout = function(after) {
this._idleNext = this;
this._idleStart = null;
this._onTimeout = null;
this._repeat = false;
this._repeat = null;
};

Timeout.prototype.unref = function() {
Expand Down

0 comments on commit 776b73b

Please sign in to comment.