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

js: Reindent some code

Browse Source 
... to make sure it conforms to the non-legacy style
before touching it.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2160>
This commit is contained in:
Florian Müllner 2022-02-07 16:03:55 +01:00 committed by Marge Bot
parent 3973c84e97
commit 29dfde5a4a
2 changed files with 101 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
js/ui/components/networkAgent.js
View File

@ -205,9 +205,13 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
case 'wpa-none': case 'wpa-none':
case 'wpa-psk': case 'wpa-psk':
case 'sae': case 'sae':
secrets.push({ label: _('Password'), key: 'psk', secrets.push({
value: wirelessSecuritySetting.psk || '', label: _('Password'),
validate: this._validateWpaPsk, password: true }); key: 'psk',
value: wirelessSecuritySetting.psk || '',
validate: this._validateWpaPsk,
password: true,
});
break; break;
case 'none': // static WEP case 'none': // static WEP
secrets.push({ secrets.push({
@ -221,8 +225,12 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
break; break;
case 'ieee8021x': case 'ieee8021x':
if (wirelessSecuritySetting.auth_alg == 'leap') { // Cisco LEAP if (wirelessSecuritySetting.auth_alg == 'leap') { // Cisco LEAP
secrets.push({ label: _('Password'), key: 'leap-password', secrets.push({
value: wirelessSecuritySetting.leap_password || '', password: true }); label: _('Password'),
key: 'leap-password',
value: wirelessSecuritySetting.leap_password || '',
password: true,
});
} else { // Dynamic (IEEE 802.1x) WEP } else { // Dynamic (IEEE 802.1x) WEP
this._get8021xSecrets(secrets); this._get8021xSecrets(secrets);
} }
@ -241,16 +249,28 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
/* If hints were given we know exactly what we need to ask */ /* If hints were given we know exactly what we need to ask */
if (this._settingName == "802-1x" && this._hints.length) { if (this._settingName == "802-1x" && this._hints.length) {
if (this._hints.includes('identity')) { if (this._hints.includes('identity')) {
secrets.push({ label: _('Username'), key: 'identity', secrets.push({
value: ieee8021xSetting.identity || '', password: false }); label: _('Username'),
key: 'identity',
value: ieee8021xSetting.identity || '',
password: false,
});
} }
if (this._hints.includes('password')) { if (this._hints.includes('password')) {
secrets.push({ label: _('Password'), key: 'password', secrets.push({
value: ieee8021xSetting.password || '', password: true }); label: _('Password'),
key: 'password',
value: ieee8021xSetting.password || '',
password: true,
});
} }
if (this._hints.includes('private-key-password')) { if (this._hints.includes('private-key-password')) {
secrets.push({ label: _('Private key password'), key: 'private-key-password', secrets.push({
value: ieee8021xSetting.private_key_password || '', password: true }); label: _('Private key password'),
key: 'private-key-password',
value: ieee8021xSetting.private_key_password || '',
password: true,
});
} }
return; return;
} }
@ -264,16 +284,32 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
// TTLS and PEAP are actually much more complicated, but this complication // TTLS and PEAP are actually much more complicated, but this complication
// is not visible here since we only care about phase2 authentication // is not visible here since we only care about phase2 authentication
// (and don't even care of which one) // (and don't even care of which one)
secrets.push({ label: _('Username'), key: null, secrets.push({
value: ieee8021xSetting.identity || '', password: false }); label: _('Username'),
secrets.push({ label: _('Password'), key: 'password', key: null,
value: ieee8021xSetting.password || '', password: true }); value: ieee8021xSetting.identity || '',
password: false,
});
secrets.push({
label: _('Password'),
key: 'password',
value: ieee8021xSetting.password || '',
password: true,
});
break; break;
case 'tls': case 'tls':
secrets.push({ label: _('Identity'), key: null, secrets.push({
value: ieee8021xSetting.identity || '', password: false }); label: _('Identity'),
secrets.push({ label: _('Private key password'), key: 'private-key-password', key: null,
value: ieee8021xSetting.private_key_password || '', password: true }); value: ieee8021xSetting.identity || '',
password: false,
});
secrets.push({
label: _('Private key password'),
key: 'private-key-password',
value: ieee8021xSetting.private_key_password || '',
password: true,
});
break; break;
default: default:
log('Invalid EAP/IEEE802.1x method: %s'.format(ieee8021xSetting.get_eap_method(0))); log('Invalid EAP/IEEE802.1x method: %s'.format(ieee8021xSetting.get_eap_method(0)));
@ -282,12 +318,22 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
_getPPPoESecrets(secrets) { _getPPPoESecrets(secrets) {
let pppoeSetting = this._connection.get_setting_pppoe(); let pppoeSetting = this._connection.get_setting_pppoe();
secrets.push({ label: _('Username'), key: 'username', secrets.push({
value: pppoeSetting.username || '', password: false }); label: _('Username'),
secrets.push({ label: _('Service'), key: 'service', key: 'username',
value: pppoeSetting.service || '', password: false }); value: pppoeSetting.username || '',
secrets.push({ label: _('Password'), key: 'password', password: false,
value: pppoeSetting.password || '', password: true }); });
secrets.push({
label: _('Service'), key: 'service',
value: pppoeSetting.service || '',
password: false,
});
secrets.push({
label: _('Password'), key: 'password',
value: pppoeSetting.password || '',
password: true,
});
} }
_getMobileSecrets(secrets, connectionType) { _getMobileSecrets(secrets, connectionType) {
@ -296,8 +342,12 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
setting = this._connection.get_setting_cdma() || this._connection.get_setting_gsm(); setting = this._connection.get_setting_cdma() || this._connection.get_setting_gsm();
else else
setting = this._connection.get_setting_by_name(connectionType); setting = this._connection.get_setting_by_name(connectionType);
secrets.push({ label: _('Password'), key: 'password', secrets.push({
value: setting.value || '', password: true }); label: _('Password'),
key: 'password',
value: setting.value || '',
password: true,
});
} }
_getContent() { _getContent() {
@ -320,8 +370,12 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
case '802-3-ethernet': case '802-3-ethernet':
content.title = _("Wired 802.1X authentication"); content.title = _("Wired 802.1X authentication");
content.message = null; content.message = null;
content.secrets.push({ label: _('Network name'), key: null, content.secrets.push({
value: connectionSetting.get_id(), password: false }); label: _('Network name'),
key: null,
value: connectionSetting.get_id(),
password: false,
});
this._get8021xSecrets(content.secrets); this._get8021xSecrets(content.secrets);
break; break;
case 'pppoe': case 'pppoe':
@ -334,8 +388,12 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog {
let gsmSetting = this._connection.get_setting_gsm(); let gsmSetting = this._connection.get_setting_gsm();
content.title = _("PIN code required"); content.title = _("PIN code required");
content.message = _("PIN code is needed for the mobile broadband device"); content.message = _("PIN code is needed for the mobile broadband device");
content.secrets.push({ label: _('PIN'), key: 'pin', content.secrets.push({
value: gsmSetting.pin || '', password: true }); label: _('PIN'),
key: 'pin',
value: gsmSetting.pin || '',
password: true,
});
break; break;
} }
// fall through // fall through

22
js/ui/status/network.js
View File

@ -2127,18 +2127,20 @@ class Indicator extends PanelMenu.SystemIndicator {
if (this._portalHelperProxy) { if (this._portalHelperProxy) {
this._portalHelperProxy.AuthenticateRemote(path, '', timestamp); this._portalHelperProxy.AuthenticateRemote(path, '', timestamp);
} else { } else {
new PortalHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PortalHelper', new PortalHelperProxy(Gio.DBus.session,
'/org/gnome/Shell/PortalHelper', (proxy, error) => { 'org.gnome.Shell.PortalHelper',
if (error) { '/org/gnome/Shell/PortalHelper',
log('Error launching the portal helper: %s'.format(error)); (proxy, error) => {
return; if (error) {
} log('Error launching the portal helper: %s'.format(error));
return;
}
this._portalHelperProxy = proxy; this._portalHelperProxy = proxy;
proxy.connectSignal('Done', this._portalHelperDone.bind(this)); proxy.connectSignal('Done', this._portalHelperDone.bind(this));
proxy.AuthenticateRemote(path, '', timestamp); proxy.AuthenticateRemote(path, '', timestamp);
}); });
} }
this._connectivityQueue.push(path); this._connectivityQueue.push(path);