Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 9 additions & 22 deletions src/prototype/lang/periodical_executer.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,18 @@ var PeriodicalExecuter = Class.create({
initialize: function(callback, frequency) {
this.callback = callback;
this.frequency = frequency;
this.currentlyExecuting = false;

this.registerCallback();
this.start();
},

registerCallback: function() {
this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
/**
* PeriodicalExecuter#start() -> undefined
*
* Starts the [[PeriodicalExecuter]] or restarts it if `#stop`
* was previously called.
**/
start: function() {
if (!this.timer) this.timer = setInterval(this.execute.bind(this), this.frequency * 1000);
},

execute: function() {
Expand Down Expand Up @@ -71,22 +76,4 @@ var PeriodicalExecuter = Class.create({
clearInterval(this.timer);
this.timer = null;
},

onTimerEvent: function() {
if (!this.currentlyExecuting) {
// IE doesn't support `finally` statements unless all errors are caught.
// We mimic the behaviour of `finally` statements by duplicating code
// that would belong in it. First at the bottom of the `try` statement
// (for errorless cases). Secondly, inside a `catch` statement which
// rethrows any caught errors.
try {
this.currentlyExecuting = true;
this.execute();
this.currentlyExecuting = false;
} catch(e) {
this.currentlyExecuting = false;
throw e;
}
}
}
});
20 changes: 0 additions & 20 deletions test/unit/periodical_executer_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,4 @@ new Test.Unit.Runner({
this.assertEqual(3, peEventCount);
});
},

testOnTimerEventMethod: function() {
var testcase = this,
pe = {
onTimerEvent: PeriodicalExecuter.prototype.onTimerEvent,
execute: function() {
testcase.assert(pe.currentlyExecuting);
}
};

pe.onTimerEvent();
this.assert(!pe.currentlyExecuting);

pe.execute = function() {
testcase.assert(pe.currentlyExecuting);
throw new Error()
}
this.assertRaise('Error', pe.onTimerEvent.bind(pe));
this.assert(!pe.currentlyExecuting);
}
});