Fixed minor issues.

js/blocked_number_controller.js

@@ -5,81 +5,81 @@
 
 // eslint-disable-next-line func-names
 (function() {
-    'use strict';
+  'use strict';
 
-    window.Whisper = window.Whisper || {};
+  window.Whisper = window.Whisper || {};
 
-    const blockedNumbers = new Whisper.BlockedNumberCollection();
+  const blockedNumbers = new Whisper.BlockedNumberCollection();
-    window.getBlockedNumbers = () => blockedNumbers;
+  window.getBlockedNumbers = () => blockedNumbers;
 
-    window.BlockedNumberController = {
+  window.BlockedNumberController = {
-      getAll() {
+    getAll() {
-        try {
+      try {
-          this.load();
+        this.load();
-        } catch (e) {
+      } catch (e) {
-          console.warn(e);
+        window.log.warn(e);
-        }
+      }
-        return blockedNumbers;
+      return blockedNumbers;
-      },
+    },
-      reset() {
+    reset() {
-        blockedNumbers.reset([]);
+      blockedNumbers.reset([]);
-      },
+    },
-      load() {
+    load() {
-        window.log.info('BlockedNumberController: starting initial fetch');
+      window.log.info('BlockedNumberController: starting initial fetch');
 
-        if (blockedNumbers.length) {
+      if (blockedNumbers.length) {
-          throw new Error('BlockedNumberController: Already loaded!');
+        throw new Error('BlockedNumberController: Already loaded!');
-        }
+      }
 
-        if (!storage) {
+      if (!storage) {
-          throw new Error('BlockedNumberController: Could not load blocked numbers');
+        throw new Error('BlockedNumberController: Could not load blocked numbers');
-        }
+      }
 
-        // Add the numbers to the collection
+      // Add the numbers to the collection
-        const numbers = storage.getBlockedNumbers();
+      const numbers = storage.getBlockedNumbers();
-        blockedNumbers.add(
+      blockedNumbers.add(
-          numbers.map(number => ({ number }))
+        numbers.map(number => ({ number }))
-        );
+      );
-      },
+    },
-      block(number) {
+    block(number) {
-        const ourNumber = textsecure.storage.user.getNumber();
+      const ourNumber = textsecure.storage.user.getNumber();
 
-        // Make sure we don't block ourselves
+      // Make sure we don't block ourselves
-        if (ourNumber === number) {
+      if (ourNumber === number) {
-          window.log.info('BlockedNumberController: Cannot block yourself!');
+        window.log.info('BlockedNumberController: Cannot block yourself!');
-          return null;
+        return null;
-        }
+      }
 
-        storage.addBlockedNumber(number);
+      storage.addBlockedNumber(number);
 
-        // Make sure we don't add duplicates
+      // Make sure we don't add duplicates
-        const exists = blockedNumbers.getNumber(number);
+      const exists = blockedNumbers.getNumber(number);
-        if (exists)
+      if (exists)
-          return exists;
+        return exists;
 
-        return blockedNumbers.add({ number });
+      return blockedNumbers.add({ number });
-      },
+    },
-      unblock(number) {
+    unblock(number) {
-        storage.removeBlockedNumber(number);
+      storage.removeBlockedNumber(number);
 
-        // Make sure we don't add duplicates
+      // Make sure we don't add duplicates
-        const exists = blockedNumbers.getNumber(number);
+      const exists = blockedNumbers.getNumber(number);
-        if (exists) {
+      if (exists) {
-          blockedNumbers.remove(exists);
+        blockedNumbers.remove(exists);
-          return exists;
+        return exists;
-        }
+      }
 
-        return null;
+      return null;
-      },
+    },
-      unblockAll() {
+    unblockAll() {
-        const all = blockedNumbers.models;
+      const all = blockedNumbers.models;
-        all.forEach(number => {
+      all.forEach(number => {
-          storage.removeBlockedNumber(number);
+        storage.removeBlockedNumber(number);
-          blockedNumbers.remove(number);
+        blockedNumbers.remove(number);
-        });
+      });
-      },
+    },
-      isBlocked(number) {
+    isBlocked(number) {
-        return storage.isBlocked(number);
+      return storage.isBlocked(number);
-      },
+    },
-    };
+  };
-  })();
+})();