Merge pull request #39 from cloudoptlab/fix/2.x/issue-fixes

Fix/2.x/issue fixes

Author: T-baby

src/background/bookmark.ts

@@ -1,4 +1,5 @@
 import message from '../core/message'
+import * as logger from '../core/logger'
 
 function search(text: any, sender: any, sendResponse: (something: any) => void) {
     try {
@@ -16,5 +17,11 @@ message.addListener({
 })
 
 chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
-    message.sendTab(tabId, 'load-complete')
+    message.sendTab(tabId, 'load-complete').then((result: any) => {
+        // catch last error of messaging
+        if (chrome.runtime.lastError) {
+            logger.debug(chrome.runtime.lastError.message);
+        }
+        return result
+    })
 })

src/content/bookmark.ts

@@ -58,6 +58,8 @@ class BookmarkSearch {
             $('#nx_query').bind('input propertychange', () => {
                 this.sendSearch(this.getKeyword())
             })
+        } else {
+            return
         }
 
         this.sendSearch(this.getKeyword())

src/core/config.ts

@@ -31,7 +31,7 @@ export class Config {
 
 let configObject: Config = {
     safeCloud: true,
-    safeDownload: true,
+    safeDownload: false,
     safeCoin: true,
     safePrivacy: true,
     safePotential: false,

src/core/grade.ts

@@ -109,12 +109,18 @@ export async function website(url: string): Promise<Result> {
         try {
             record = await api.gradeWebsite(host)
             record.safe = await record.isSafe()
+            store.set(cacheKey, record.toString())
         } catch (error) {
             record = new Result()
             record.score = 60
             record.safe = true
+            // When there is no record on cloudopt.net yet
+            if (error.error === 404) {
+                record.host = 'UNKNOWN'
+                record.type = 'UNKNOWN'
+                store.set(cacheKey, record.toString())
+            }
         }
-        store.set(cacheKey, record.toString())
     }
 
     return record

src/option/component/adBlock/index.scss

@@ -102,4 +102,9 @@
             }
         }
     }
+    button {
+        &.close {
+            outline: none;
+        }
+    }
 }

src/popup/popup.ts

@@ -272,7 +272,7 @@ async function initialize() {
         const countNode = $('#credibilityScore .score-count')
         countNode.text(result.score)
 
-        if (result.score === 0 && result.isSafe) {
+        if (result.score === 0 && result.isSafe()) {
             countNode.text('?')
         } else if (result.score < 60) {
             // $('.mdl-layout__header').css('background-color', '#e53935')