feat: add option jump to vocabulary.com for toast clicking

Author: waynecz

.eslintrc.js

@@ -21,6 +21,7 @@ module.exports = {
     'no-unused-vars': 'off',
     'no-new': 'off',
     'no-undef': 'off',
+    'comma-dangle': 'off',
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dadda-translate",
-  "version": "1.2.16",
+  "version": "1.2.17",
   "description": "translate and remember",
   "scripts": {
     "dev": "node_modules/.bin/webpack --progress --config build/webpack.dev.js",

src/api/host.js

@@ -6,6 +6,7 @@ export const SHANBAY_HOST = 'http://www.shanbay.com/api/v1'
 
 // dictionary.com 查询 HOST
 export const DICTIONARY_HOST = 'http://fanyi.sogou.com/#auto/zh-CHS/'
+export const VOCABULARY_HOST = 'https://www.vocabulary.com/dictionary/'
 
 // 词根字典查询 HOST
 export const CGDICT_HOST = 'http://www.cgdict.com/index.php?app=cigen&ac=word&w='

src/changelog-breif.json

@@ -27,5 +27,6 @@
   "1.2.13": "修复 '+' 号无法翻译的问题",
   "1.2.14": "暂时：无法呼出时弹出搜狗验证窗口，下个版本更换翻译源 🤪",
   "1.2.15": "当搜狗不可用时降级为谷歌",
-  "1.2.16": "修复谷歌只翻译一句话的问题"
+  "1.2.16": "修复谷歌只翻译一句话的问题",
+  "1.2.17": "新增点击吐司跳转到 vocabulary.com 查看释义的选项，建议开启"
 }

src/chrome/background/background.js

@@ -9,7 +9,7 @@ import Toast from '@/chrome/toast'
 import setNewAlarm from '@/chrome/alarm'
 
 import { _removeTRId, _hasTRId, _wrapTRId, _sleep } from '@/utils'
-import { DICTIONARY_HOST, SOGOU_HOST } from '@/api/host'
+import { DICTIONARY_HOST, SOGOU_HOST, VOCABULARY_HOST } from '@/api/host'
 import {
   DELAY_MINS_IN_EVERY_STAGE,
   TR_SETTING_HAS_TOAST_KEY,
@@ -27,7 +27,8 @@ import {
   TR_SETTING_LASTING_TOAST,
   TR_SETTING_CALLOUT_INPUT,
   TR_SETTING_HIDE_CONTEXT_MENU_OPTION,
-  TR_SETTING_CLOSE_ALL_TOAST_KEY
+  TR_SETTING_CLOSE_ALL_TOAST_KEY,
+  TR_SETTING_USE_VOCABULARYCOM,
 } from '@/utils/constant'
 
 import HotReload from './hot-reload'
@@ -49,7 +50,7 @@ const detectGo = () => {
   Storage.get(TR_SETTING_IS_DIRECTLY_KEY, false).then(isDirectly => {
     chrome.browserAction.setBadgeText({ text: isDirectly ? 'go' : '' })
     chrome.browserAction.setBadgeBackgroundColor({
-      color: isDirectly ? '#ed559d' : '#fff'
+      color: isDirectly ? '#ed559d' : '#fff',
     })
   })
 }
@@ -88,7 +89,7 @@ chrome.runtime.onInstalled.addListener(async reason => {
       message: require('@/changelog-breif.json')[version] || '点击查看更新内容',
       requireInteraction: true,
       priority: 2,
-      eventTime: Date.now() + 100000
+      eventTime: Date.now() + 100000,
     })
     detectGo()
   }
@@ -186,7 +187,7 @@ chrome.runtime.onMessage.addListener((request, sender, sendRes) => {
     case 'jumpToSogou': {
       // Request is considered as a spider
       chrome.tabs.create({
-        url: 'https://fanyi.sogou.com'
+        url: 'https://fanyi.sogou.com',
       })
       return true
     }
@@ -209,7 +210,12 @@ chrome.alarms.onAlarm.addListener(async alarm => {
   if (_hasTRId(alarm.name) && toastLock) {
     const word = _removeTRId(alarm.name)
 
-    Toast(word, 'Look the meanings in Sougou')
+    const useVocabularyCom = await Storage.get(
+      TR_SETTING_USE_VOCABULARYCOM,
+      false
+    )
+
+    Toast(word, `Click to see more`)
   }
 })
 
@@ -271,14 +277,27 @@ chrome.notifications.onButtonClicked.addListener(async (notiId, btnId) => {
  */
 chrome.notifications.onClicked.addListener(async notiId => {
   if (notiId === 'updateInfo') {
+    const path = chrome.runtime.getURL(`options/options.html#link=setting`)
+
     chrome.tabs.create({
-      url: 'https://github.com/waynecz/dadda-translate-crx/releases'
+      url: path,
     })
   }
 
   if (_hasTRId(notiId)) {
     const word = _removeTRId(notiId)
-    chrome.tabs.create({ url: `${DICTIONARY_HOST}${encodeURI(word)}` })
+
+    const useVocabularyCom = await Storage.get(
+      TR_SETTING_USE_VOCABULARYCOM,
+      false
+    )
+
+    if (useVocabularyCom) {
+      chrome.tabs.create({ url: `${VOCABULARY_HOST}${encodeURI(word)}` })
+    } else {
+      chrome.tabs.create({ url: `${DICTIONARY_HOST}${encodeURI(word)}` })
+    }
+
     moveWord2NextStage(word)
     const isLasting = await Storage.get(TR_SETTING_LASTING_TOAST, false)
 
@@ -303,10 +322,10 @@ Storage.get(TR_SETTING_HIDE_CONTEXT_MENU_OPTION, false).then(value => {
             code:
               "document.dispatchEvent(new CustomEvent('contextMenuClick', { bubbles: true, detail: { text: \"" +
               info.selectionText +
-              '" } }))'
+              '" } }))',
           })
         }
-      }
+      },
     })
   }
 })
@@ -346,8 +365,8 @@ chrome.webRequest.onBeforeSendHeaders.addListener(
   {
     urls: [
       'https://fanyi.sogou.com/reventondc/translate',
-      'https://fanyi.sogou.com/logtrace'
-    ]
+      'https://fanyi.sogou.com/logtrace',
+    ],
   },
   ['requestHeaders', 'blocking', 'extraHeaders']
 )

src/components/react/Setting.js

@@ -19,7 +19,8 @@ import {
   TR_SETTING_CALLOUT_INPUT,
   TR_SETTING_ONLY_OXFORD,
   TR_SETTING_HIDE_CONTEXT_MENU_OPTION,
-  TR_SETTING_LASTING_TOAST
+  TR_SETTING_LASTING_TOAST,
+  TR_SETTING_USE_VOCABULARYCOM,
 } from '@/utils/constant'
 
 @withView
@@ -122,9 +123,14 @@ class Setting extends Component {
       {
         key: TR_SETTING_HIDE_CONTEXT_MENU_OPTION,
         label: '隐藏右键菜单选项',
-        isNew: true,
         tip: <small className="setting_tip">开启后右键菜单内将不存在达达划词翻译</small>
-      }
+      },
+      {
+        key: TR_SETTING_USE_VOCABULARYCOM,
+        isNew: true,
+        label: 'vocabulary.com 作为吐司目的地',
+        tip: <small className="setting_tip">开启后点击吐司一律跳转到<br/> vocabulary.com，纯英英解释，加强记忆</small>
+      },
     ]
   }
 

src/manifest.json

@@ -2,7 +2,7 @@
   "description": "划词翻译、生词本、吐司弹词、与扇贝同步",
   "name": "达达划词翻译",
   "manifest_version": 2,
-  "version": "1.2.16",
+  "version": "1.2.17",
   "author": "Waynecz <[email protected]>",
   "homepage_url": "https://github.com/waynecz/dadda-translate-crx",
   "content_security_policy": "font-src 'self' https://fonts.googleapis.com; script-src 'self' 'unsafe-eval'; object-src 'self'",

src/utils/constant.js

@@ -39,6 +39,9 @@ export const TR_SETTING_CLOSE_ALL_TOAST_KEY = '__TR_SETTING_CLOSE_ALL_TOAST_KEY_
 // 是否注册右键菜单
 export const TR_SETTING_HIDE_CONTEXT_MENU_OPTION = '__TR_SETTING_HIDE_CONTEXT_MENU_OPTION__'
 
+// 点击吐司时跳转到 vocabualry.com 而不是 sogou.com
+export const TR_SETTING_USE_VOCABULARYCOM = '__TR_SETTING_USE_VOCABULARYCOM__'
+
 // 导出内容
 export const TR_SETTING_EXPORT_ALL_WORDS = '__TR_SETTING_EXPORT_ALL_WORDS__'