[polari] cleanup: Avoid unnecessary parentheses
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] cleanup: Avoid unnecessary parentheses
- Date: Wed, 14 Aug 2019 19:06:10 +0000 (UTC)
commit 01b4d2b6989949587f80d3ec2c280710bf4e0188
Author: Florian Müllner <fmuellner gnome org>
Date: Tue Aug 6 15:25:13 2019 +0000
cleanup: Avoid unnecessary parentheses
Extra parentheses usually add noise rather than clarity, so avoid
them.
https://gitlab.gnome.org/GNOME/polari/merge_requests/133
src/application.js | 4 ++--
src/chatView.js | 4 ++--
src/ircParser.js | 2 +-
src/mainWindow.js | 2 +-
src/roomList.js | 8 ++++----
src/serverRoomManager.js | 2 +-
src/tabCompletion.js | 2 +-
src/telepathyClient.js | 10 +++++-----
src/userList.js | 2 +-
src/userTracker.js | 2 +-
10 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/src/application.js b/src/application.js
index a89b883..be52957 100644
--- a/src/application.js
+++ b/src/application.js
@@ -205,7 +205,7 @@ var Application = GObject.registerClass({
}, {
name: 'leave-current-room',
activate: this._onLeaveCurrentRoom.bind(this),
- create_hook: (a) => a.enabled = false,
+ create_hook: a => a.enabled = false,
accels: ['<Primary>w']
}, {
name: 'reconnect-room',
@@ -496,7 +496,7 @@ var Application = GObject.registerClass({
'account': new GLib.Variant('s', GLib.get_user_name()),
'server': new GLib.Variant('s', server),
'port': new GLib.Variant('u', port ? port : 6667),
- 'use-ssl': new GLib.Variant('b', (port == 6697)),
+ 'use-ssl': new GLib.Variant('b', port == 6697),
};
name = server;
}
diff --git a/src/chatView.js b/src/chatView.js
index f42c6b5..31e5ed2 100644
--- a/src/chatView.js
+++ b/src/chatView.js
@@ -1236,7 +1236,7 @@ var ChatView = GObject.registerClass({
this._insertMessage(iter, message, this._state);
if (message.pendingId == undefined /* outgoing */ ||
- (this._app.isRoomFocused(this._room) && this._pending.size == 0))
+ this._app.isRoomFocused(this._room) && this._pending.size == 0)
this._channel.ack_message_async(tpMessage, null);
else if (this._needsIndicator)
this._setIndicatorMark(this._view.buffer.get_end_iter());
@@ -1316,7 +1316,7 @@ var ChatView = GObject.registerClass({
Polari.util_match_identify_message(text);
if (isIdentify)
- text = text.replace(password, (p) => p.replace(/./g, '●'));
+ text = text.replace(password, p => p.replace(/./g, '●'));
}
let channels = Utils.findChannels(text, server);
diff --git a/src/ircParser.js b/src/ircParser.js
index 2577a37..7887390 100644
--- a/src/ircParser.js
+++ b/src/ircParser.js
@@ -77,7 +77,7 @@ var IrcParser = class {
if (command)
command = command.toUpperCase();
- retval = (command == null || knownCommands[command] != null);
+ retval = command == null || knownCommands[command] != null;
if (!retval) {
output = this._createFeedbackLabel(_(UNKNOWN_COMMAND_MESSAGE));
diff --git a/src/mainWindow.js b/src/mainWindow.js
index c7ade54..179bf9a 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -227,7 +227,7 @@ var MainWindow = GObject.registerClass({
_onAccountsReachableChanged() {
let accounts = this._accountsMonitor.visibleAccounts;
this._offlineInfoBar.revealed =
- (accounts.length > 0) && !accounts.some(a => a.reachable);
+ accounts.length > 0 && !accounts.some(a => a.reachable);
}
_onWindowStateEvent(widget, event) {
diff --git a/src/roomList.js b/src/roomList.js
index a48c51f..999bced 100644
--- a/src/roomList.js
+++ b/src/roomList.js
@@ -326,8 +326,8 @@ var RoomListHeader = GObject.registerClass({
let status = this._getConnectionStatus();
let reason = this._account.connection_status_reason;
let authError = Tp.error_get_dbus_name(Tp.Error.AUTHENTICATION_FAILED);
- let isError = (status == Tp.ConnectionStatus.DISCONNECTED &&
- reason != Tp.ConnectionStatusReason.REQUESTED);
+ let isError = status == Tp.ConnectionStatus.DISCONNECTED &&
+ reason != Tp.ConnectionStatusReason.REQUESTED;
let isAuth = isError && this._account.connection_error == authError;
let child = 'default';
@@ -350,7 +350,7 @@ var RoomListHeader = GObject.registerClass({
}
this._iconStack.visible_child_name = child;
- this._spinner.active = (child == 'connecting');
+ this._spinner.active = child == 'connecting';
this._popoverTitle.visible = !isAuth;
if (this._spinner.active)
@@ -370,7 +370,7 @@ var RoomListHeader = GObject.registerClass({
/* Translators: This is an account name followed by a
server address, e.g. "GNOME (irc.gnome.org)" */
let fullTitle = _('%s (%s)').format(accountName, server);
- this._popoverTitle.label = (accountName == server) ? accountName : fullTitle;
+ this._popoverTitle.label = accountName == server ? accountName : fullTitle;
this._popoverStatus.label = `<sup>${this._getStatusLabel()}<${'/'}sup>`;
} else {
let styleContext = this._popoverStatus.get_style_context();
diff --git a/src/serverRoomManager.js b/src/serverRoomManager.js
index c22caa5..26c41e3 100644
--- a/src/serverRoomManager.js
+++ b/src/serverRoomManager.js
@@ -354,7 +354,7 @@ var ServerRoomList = GObject.registerClass({
_checkSpinner() {
let loading = this._pendingInfos.length ||
- (this._account && this._manager.isLoading(this._account));
+ this._account && this._manager.isLoading(this._account);
this._spinner.active = loading;
}
diff --git a/src/tabCompletion.js b/src/tabCompletion.js
index e3481d9..f6d8d64 100644
--- a/src/tabCompletion.js
+++ b/src/tabCompletion.js
@@ -211,7 +211,7 @@ var TabCompletion = class {
// Chain completions if the current completion directly follows a previous one,
// except when one of them was for an IRC command
- let previousCompletion = (this._endPos == this._startPos);
+ let previousCompletion = this._endPos == this._startPos;
this._isChained = previousCompletion && !this._isCommand && !this._previousWasCommand;
this._list.invalidate_filter();
diff --git a/src/telepathyClient.js b/src/telepathyClient.js
index a4dcba1..cbebbc8 100644
--- a/src/telepathyClient.js
+++ b/src/telepathyClient.js
@@ -75,7 +75,7 @@ class SASLAuthHandler {
_onSASLStatusChanged(proxy, sender, [status]) {
let name = this._channel.connection.get_account().display_name;
- let statusString = (Object.keys(SASLStatus))[status];
+ let statusString = Object.keys(SASLStatus)[status];
debug(`Auth status for server "${name}": ${statusString}`);
switch (status) {
@@ -154,7 +154,7 @@ class TelepathyClient extends Tp.BaseClient {
Gio.DBusSignalFlags.MATCH_ARG0_NAMESPACE,
(_conn, _sender, _path, _iface, _signal, params) => {
let [name_, oldOwner_, newOwner] = params.deep_unpack();
- this._shellHandlesPrivateChats = (newOwner != '');
+ this._shellHandlesPrivateChats = newOwner != '';
});
conn.call(
@@ -261,7 +261,7 @@ class TelepathyClient extends Tp.BaseClient {
if (account.connection_status != Tp.ConnectionStatus.CONNECTED)
return;
- Utils.lookupIdentifyPassword(account, (password) => {
+ Utils.lookupIdentifyPassword(account, password => {
if (password)
this._sendIdentify(account, password);
else
@@ -354,7 +354,7 @@ class TelepathyClient extends Tp.BaseClient {
let contactName = settings.get_string('identify-botname');
let command = settings.get_string('identify-command');
this._requestChannel(account, Tp.HandleType.CONTACT, contactName,
- (channel) => {
+ channel => {
if (!channel)
return;
@@ -481,7 +481,7 @@ class TelepathyClient extends Tp.BaseClient {
if (!data)
return;
- Utils.storeIdentifyPassword(account, data.password, (res) => {
+ Utils.storeIdentifyPassword(account, data.password, res => {
if (res)
this._saveIdentifySettings(account, data);
diff --git a/src/userList.js b/src/userList.js
index 733e440..ce74517 100644
--- a/src/userList.js
+++ b/src/userList.js
@@ -456,7 +456,7 @@ var UserPopover = GObject.registerClass({
label = _('Offline');
this._statusLabel.label = label;
- this._nickLabel.sensitive = (status == Tp.ConnectionPresenceType.AVAILABLE);
+ this._nickLabel.sensitive = status == Tp.ConnectionPresenceType.AVAILABLE;
}
_updateDetailsContact() {
diff --git a/src/userTracker.js b/src/userTracker.js
index 0f45d93..b3a02dc 100644
--- a/src/userTracker.js
+++ b/src/userTracker.js
@@ -154,7 +154,7 @@ const UserTracker = GObject.registerClass({
_clearUsersFromRoom(room) {
let map = this._getRoomContacts(room);
for (let [, contacts] of map)
- contacts.slice().forEach((m) => this._untrackMember(m, room));
+ contacts.slice().forEach(m => this._untrackMember(m, room));
}
_ensureRoomMappingForRoom(room) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]