brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adopt EventEmitter class instead of injecting Signal methods

Browse Source 
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:
Evan Welsh
2022-07-04 18:30:44 -04:00
parent 9e30afe678
commit a88e59c1a8
39 changed files with 204 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/popupMenu.js
View File

@ -4,7 +4,7 @@
PopupMenuSection, PopupSubMenuMenuItem, PopupMenuManager */
const { Atk, Clutter, Gio, GObject, Graphene, Shell, St } = imports.gi;
const Signals = imports.signals;
const Signals = imports.misc.signals;
const BoxPointer = imports.ui.boxpointer;
const Main = imports.ui.main;
@ -480,8 +480,10 @@ class PopupImageMenuItem extends PopupBaseMenuItem {
}
});
var PopupMenuBase = class {
var PopupMenuBase = class extends Signals.EventEmitter {
constructor(sourceActor, styleClass) {
super();
if (this.constructor === PopupMenuBase)
throw new TypeError(`Cannot instantiate abstract class ${this.constructor.name}`);
@ -805,7 +807,6 @@ var PopupMenuBase = class {
Main.sessionMode.disconnectObject(this);
}
};
Signals.addSignalMethods(PopupMenuBase.prototype);
var PopupMenu = class extends PopupMenuBase {
constructor(sourceActor, arrowAlignment, arrowSide) {
@ -951,8 +952,10 @@ var PopupMenu = class extends PopupMenuBase {
}
};
var PopupDummyMenu = class {
var PopupDummyMenu = class extends Signals.EventEmitter {
constructor(sourceActor) {
super();
this.sourceActor = sourceActor;
this.actor = sourceActor;
this.actor._delegate = this;
@ -986,7 +989,6 @@ var PopupDummyMenu = class {
this.emit('destroy');
}
};
Signals.addSignalMethods(PopupDummyMenu.prototype);
var PopupSubMenu = class extends PopupMenuBase {
constructor(sourceActor, sourceArrow) {