[polari] cleanup: Don't use comparison operator when checking falsy values



commit 50c3ad1a4b19baac8686b6e60d3cf2600ec95c4c
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Aug 7 02:13:12 2019 +0200

    cleanup: Don't use comparison operator when checking falsy values
    
    We mostly use the regular == and != comparison operators over their
    type-safe === and !== counterparts. This is about to change, but there
    are some places where we don't care whether a value is null, undefined
    or 0; just check for falsiness there instead of using operators, so
    we can start to consistently use the type-safe operators everywhere
    else in a follow-up commit.
    
    https://gitlab.gnome.org/GNOME/polari/merge_requests/133

 src/application.js       | 2 +-
 src/entryArea.js         | 4 ++--
 src/ircParser.js         | 2 +-
 src/networksManager.js   | 2 +-
 src/roomManager.js       | 4 ++--
 src/serverRoomManager.js | 2 +-
 src/telepathyClient.js   | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/application.js b/src/application.js
index 74f425d..6a2eac7 100644
--- a/src/application.js
+++ b/src/application.js
@@ -607,7 +607,7 @@ var Application = GObject.registerClass({
                     return;
 
                 let contact = tracker.lookupContact(nick);
-                if (contact != null && contact.alias == nick)
+                if (contact && contact.alias == nick)
                     return;
 
                 this._untrackNominalNick(account);
diff --git a/src/entryArea.js b/src/entryArea.js
index 4deedae..4f69417 100644
--- a/src/entryArea.js
+++ b/src/entryArea.js
@@ -81,14 +81,14 @@ var ChatEntry = GObject.registerClass({
         });
 
         clipboard.request_image((cb, pixbuf) => {
-            if (pixbuf == null)
+            if (!pixbuf)
                 return;
             this.emit('image-pasted', pixbuf);
         });
     }
 
     _onTextReceived(clipboard, text) {
-        if (text == null)
+        if (!text)
             return;
         text = text.trim();
 
diff --git a/src/ircParser.js b/src/ircParser.js
index 6d77cae..68ee461 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 || knownCommands[command];
 
             if (!retval) {
                 output = this._createFeedbackLabel(_(UNKNOWN_COMMAND_MESSAGE));
diff --git a/src/networksManager.js b/src/networksManager.js
index bfdb0d0..d0b2462 100644
--- a/src/networksManager.js
+++ b/src/networksManager.js
@@ -55,7 +55,7 @@ var NetworksManager = class {
     }
 
     getAccountIsPredefined(account) {
-        return account && this._networksById.get(account.service) != null;
+        return account && this._networksById.has(account.service);
     }
 
     getNetworkName(id) {
diff --git a/src/roomManager.js b/src/roomManager.js
index fc87366..e97177a 100644
--- a/src/roomManager.js
+++ b/src/roomManager.js
@@ -105,7 +105,7 @@ var RoomManager = class {
         this._settings.get_value('saved-channel-list').deep_unpack().forEach(c => {
             for (let prop in c)
                 c[prop] = c[prop].deep_unpack();
-            if (accountPath == null || c.account == accountPath)
+            if (!accountPath || c.account == accountPath)
                 this._ensureRoom(c.account, c.channel, Tp.HandleType.ROOM, 0);
         });
         this.emit('rooms-loaded');
@@ -113,7 +113,7 @@ var RoomManager = class {
 
     _removeRooms(accountPath) {
         for (let room of this._rooms.values()) {
-            if (accountPath == null || room.account.object_path == accountPath)
+            if (!accountPath || room.account.object_path == accountPath)
                 this._removeRoom(room);
         }
     }
diff --git a/src/serverRoomManager.js b/src/serverRoomManager.js
index 4526688..4251c91 100644
--- a/src/serverRoomManager.js
+++ b/src/serverRoomManager.js
@@ -329,7 +329,7 @@ var ServerRoomList = GObject.registerClass({
                 }
 
                 let room = roomManager.lookupRoomByName(roomInfo.get_name(), this._account);
-                let sensitive = room == null;
+                let sensitive = !room;
                 let checked = !sensitive;
                 let count = `${roomInfo.get_members_count(null)}`;
 
diff --git a/src/telepathyClient.js b/src/telepathyClient.js
index a106f84..2e40de9 100644
--- a/src/telepathyClient.js
+++ b/src/telepathyClient.js
@@ -177,7 +177,7 @@ class TelepathyClient extends Tp.BaseClient {
                 }
 
                 this._shellHandlesPrivateChats =
-                    names.find(n => n.startsWith(SHELL_CLIENT_PREFIX)) != null;
+                    names.some(n => n.startsWith(SHELL_CLIENT_PREFIX));
             });
     }
 
@@ -296,7 +296,7 @@ class TelepathyClient extends Tp.BaseClient {
 
     _connectRooms(account) {
         this._roomManager.rooms.forEach(room => {
-            if (account == null || room.account == account)
+            if (!account || room.account == account)
                 this._connectRoom(room);
         });
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]