Adopt EventEmitter class instead of injecting Signal methods
Introduce a new class, EventEmitter, which implements signal handling for pure JavaScript classes. EventEmitter still utilizes GJS' addSignalMethods internally. EventEmitter allows static typechecking to understand the structure of event-emitting JS classes and makes creating child classes simpler. The name 'EventEmitter' mirrors a common name for this pattern in Node and in JS libraries. Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2043>
This commit is contained in:
@ -43,12 +43,15 @@
|
||||
* are not used elsewhere. These APIs may ultimately get dropped entirely and
|
||||
* replaced by something else.
|
||||
*/
|
||||
/* exported ConcurrentBatch, ConsecutiveBatch */
|
||||
|
||||
const { GObject } = imports.gi;
|
||||
const Signals = imports.signals;
|
||||
const Signals = imports.misc.signals;
|
||||
|
||||
var Task = class {
|
||||
var Task = class extends Signals.EventEmitter {
|
||||
constructor(scope, handler) {
|
||||
super();
|
||||
|
||||
if (scope)
|
||||
this.scope = scope;
|
||||
else
|
||||
@ -64,7 +67,6 @@ var Task = class {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
Signals.addSignalMethods(Task.prototype);
|
||||
|
||||
var Hold = class extends Task {
|
||||
constructor() {
|
||||
@ -101,7 +103,6 @@ var Hold = class extends Task {
|
||||
return this._acquisitions > 0;
|
||||
}
|
||||
};
|
||||
Signals.addSignalMethods(Hold.prototype);
|
||||
|
||||
var Batch = class extends Task {
|
||||
constructor(scope, tasks) {
|
||||
@ -171,7 +172,6 @@ var Batch = class extends Task {
|
||||
this.tasks = this.tasks.splice(0, this._currentTaskIndex + 1);
|
||||
}
|
||||
};
|
||||
Signals.addSignalMethods(Batch.prototype);
|
||||
|
||||
var ConcurrentBatch = class extends Batch {
|
||||
process() {
|
||||
@ -186,7 +186,6 @@ var ConcurrentBatch = class extends Batch {
|
||||
this.nextTask();
|
||||
}
|
||||
};
|
||||
Signals.addSignalMethods(ConcurrentBatch.prototype);
|
||||
|
||||
var ConsecutiveBatch = class extends Batch {
|
||||
process() {
|
||||
@ -205,4 +204,3 @@ var ConsecutiveBatch = class extends Batch {
|
||||
}
|
||||
}
|
||||
};
|
||||
Signals.addSignalMethods(ConsecutiveBatch.prototype);
|
||||
|
Reference in New Issue
Block a user