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

cleanup: Port non-GObject classes to JS6 classes

Browse Source 
ES6 finally adds standard class syntax to the language, so we can
replace our custom Lang.Class framework with the new syntax. Any
classes that inherit from GObject will need special treatment,
so limit the port to regular javascript classes for now.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/361
This commit is contained in:
Florian Müllner
2017-10-31 02:19:44 +01:00
committed by Georges Basile Stavracas Neto
parent 99ce3deeb0
commit bacfdbbb03
102 changed files with 3454 additions and 4183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/misc/smartcardManager.js
View File

@ -1,7 +1,6 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
const Gio = imports.gi.Gio;
const Lang = imports.lang;
const Shell = imports.gi.Shell;
const Signals = imports.signals;
@ -26,9 +25,8 @@ function getSmartcardManager() {
return _smartcardManager;
}
var SmartcardManager = new Lang.Class({
Name: 'SmartcardManager',
_init() {
var SmartcardManager = class {
constructor() {
this._objectManager = new ObjectManager.ObjectManager({ connection: Gio.DBus.session,
name: "org.gnome.SettingsDaemon.Smartcard",
objectPath: '/org/gnome/SettingsDaemon/Smartcard',
@ -36,7 +34,7 @@ var SmartcardManager = new Lang.Class({
onLoaded: this._onLoaded.bind(this) });
this._insertedTokens = {};
this._loginToken = null;
},
}
_onLoaded() {
let tokens = this._objectManager.getProxiesForInterface('org.gnome.SettingsDaemon.Smartcard.Token');
@ -53,7 +51,7 @@ var SmartcardManager = new Lang.Class({
if (interfaceName == 'org.gnome.SettingsDaemon.Smartcard.Token')
this._removeToken(proxy);
});
},
}
_updateToken(token) {
let objectPath = token.get_object_path();
@ -65,7 +63,7 @@ var SmartcardManager = new Lang.Class({
if (token.UsedToLogin)
this._loginToken = token;
},
}
_addToken(token) {
this._updateToken(token);
@ -85,7 +83,7 @@ var SmartcardManager = new Lang.Class({
// Emit a smartcard-inserted at startup if it's already plugged in
if (token.IsInserted)
this.emit('smartcard-inserted', token);
},
}
_removeToken(token) {
let objectPath = token.get_object_path();
@ -99,11 +97,11 @@ var SmartcardManager = new Lang.Class({
this._loginToken = null;
token.disconnectAll();
},
}
hasInsertedTokens() {
return Object.keys(this._insertedTokens).length > 0;
},
}
hasInsertedLoginToken() {
if (!this._loginToken)
@ -115,5 +113,5 @@ var SmartcardManager = new Lang.Class({
return true;
}
});
};
Signals.addSignalMethods(SmartcardManager.prototype);