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

objectManager: Use non-legacy style

Browse Source 
There are a couple of places left where we still use the old
indentation style, update them before making code changes.

After that, there are only a couple of non-type-safe comparisons
left of legacy style, so change those as well while we're at it.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2344>
This commit is contained in:
Florian Müllner 2022-07-08 05:38:39 +02:00 committed by Marge Bot
parent 31a50cb4de
commit 97b7dee564
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/misc/objectManager.js
View File

@ -68,11 +68,11 @@ var ObjectManager = class extends Signals.EventEmitter {
} }
_tryToCompleteLoad() { _tryToCompleteLoad() {
if (this._numLoadInhibitors == 0) if (this._numLoadInhibitors === 0)
return; return;
this._numLoadInhibitors--; this._numLoadInhibitors--;
if (this._numLoadInhibitors == 0) { if (this._numLoadInhibitors === 0) {
if (this._onLoaded) if (this._onLoaded)
this._onLoaded(); this._onLoaded();
} }
@ -142,7 +142,7 @@ var ObjectManager = class extends Signals.EventEmitter {
if (index >= 0) if (index >= 0)
this._interfaces[interfaceName].splice(index, 1); this._interfaces[interfaceName].splice(index, 1);
if (this._interfaces[interfaceName].length == 0) if (this._interfaces[interfaceName].length === 0)
delete this._interfaces[interfaceName]; delete this._interfaces[interfaceName];
} }
@ -150,7 +150,7 @@ var ObjectManager = class extends Signals.EventEmitter {
this._objects[objectPath][interfaceName] = null; this._objects[objectPath][interfaceName] = null;
if (Object.keys(this._objects[objectPath]).length == 0) { if (Object.keys(this._objects[objectPath]).length === 0) {
delete this._objects[objectPath]; delete this._objects[objectPath];
this.emit('object-removed', objectPath); this.emit('object-removed', objectPath);
} }
@ -168,18 +168,18 @@ var ObjectManager = class extends Signals.EventEmitter {
} }
this._managerProxy.connectSignal('InterfacesAdded', this._managerProxy.connectSignal('InterfacesAdded',
(objectManager, sender, [objectPath, interfaces]) => { (objectManager, sender, [objectPath, interfaces]) => {
let interfaceNames = Object.keys(interfaces); let interfaceNames = Object.keys(interfaces);
for (let i = 0; i < interfaceNames.length; i++) for (let i = 0; i < interfaceNames.length; i++)
this._addInterface(objectPath, interfaceNames[i]); this._addInterface(objectPath, interfaceNames[i]);
}); });
this._managerProxy.connectSignal('InterfacesRemoved', this._managerProxy.connectSignal('InterfacesRemoved',
(objectManager, sender, [objectPath, interfaceNames]) => { (objectManager, sender, [objectPath, interfaceNames]) => {
for (let i = 0; i < interfaceNames.length; i++) for (let i = 0; i < interfaceNames.length; i++)
this._removeInterface(objectPath, interfaceNames[i]); this._removeInterface(objectPath, interfaceNames[i]);
}); });
if (Object.keys(this._interfaceInfos).length == 0) { if (Object.keys(this._interfaceInfos).length === 0) {
this._tryToCompleteLoad(); this._tryToCompleteLoad();
return; return;
} }
@ -223,9 +223,8 @@ var ObjectManager = class extends Signals.EventEmitter {
// Prevent load from completing until the interface is loaded // Prevent load from completing until the interface is loaded
this._numLoadInhibitors++; this._numLoadInhibitors++;
this._addInterface(objectPath, this._addInterface(objectPath, interfaceName,
interfaceName, this._tryToCompleteLoad.bind(this));
this._tryToCompleteLoad.bind(this));
} }
} }
this._tryToCompleteLoad(); this._tryToCompleteLoad();