fix(popup): fix preloading selection on popup page

crimx · Jul 7, 2018 · 5912183 · 5912183
1 parent 6125ca8
commit 5912183
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/src/background/server.ts b/src/background/server.ts
@@ -33,8 +33,6 @@ message.addListener((data, sender: browser.runtime.MessageSender) => {
       return playAudio(data as MsgAudioPlay)
     case MsgType.FetchDictResult:
       return fetchDictResult(data as MsgFetchDictResult)
-    case MsgType.PreloadSelection:
-      return preloadSelection()
     case MsgType.GetClipboard:
       return getClipboard()
     case MsgType.RequestCSS:
@@ -122,17 +120,6 @@ function fetchDictResult (
     })
 }
 
-function preloadSelection (): Promise<void> {
-  return browser.tabs.query({ active: true, currentWindow: true })
-    .then(tabs => {
-      if (tabs.length > 0 && tabs[0].id != null) {
-        return message.send(tabs[0].id as number, { type: MsgType.__PreloadSelection__ })
-      }
-    })
-    .then(text => text || '')
-    .catch(() => '')
-}
-
 function getClipboard (): Promise<string> {
   if (process.env.NODE_ENV === 'development') {
     return Promise.resolve('clipboard content')

diff --git a/src/content/redux/modules/dictionaries.ts b/src/content/redux/modules/dictionaries.ts
@@ -410,16 +410,28 @@ function popupPageInit (
 
   if (baPreload) {
     const fetchInfo = baPreload === 'selection'
-        ? message.send({ type: MsgType.__PreloadSelection__ })
+        ? browser.tabs.query({ active: true, currentWindow: true })
+          .then(tabs => {
+            if (tabs.length > 0 && tabs[0].id != null) {
+              return message.send(tabs[0].id as number, { type: MsgType.PreloadSelection })
+            }
+            return null
+          })
         : message.send({ type: MsgType.GetClipboard })
           .then(text => getDefaultSelectionInfo({ text, title: 'From Clipboard' }))
 
     fetchInfo.then(info => {
-      if (baAuto && info.text) {
-        dispatch(searchText({ info }))
-      } else {
-        dispatch(restoreDicts())
-        dispatch(addSearchHistory(info))
+      if (info) {
+        if (baAuto && info.text) {
+          dispatch(searchText({ info }))
+        } else {
+          dispatch(restoreDicts())
+          dispatch(addSearchHistory(info))
+        }
+      }
+    }).catch(e => {
+      if (process.env.NODE_ENV !== 'production') {
+        console.warn(e)
       }
     })
   }

diff --git a/src/typings/message.ts b/src/typings/message.ts
@@ -60,7 +60,6 @@ export const enum MsgType {
    * Background proxy sends back underlyingly
    */
   __PageInfo__,
-  __PreloadSelection__,
 }
 
 /** iframe messaging */
@@ -75,6 +74,7 @@ export interface MsgSelection {
   readonly mouseY: number
   readonly dbClick?: boolean
   readonly ctrlKey?: boolean
+  /** skip salad bowl and show panel directly */
   readonly instant?: boolean
   /** force panel to skip reconciling position */
   readonly force?: boolean