Fixed search highlight bug

kura52 · Jul 16, 2018 · a750bd0 · a750bd0
1 parent 7b48782
commit a750bd0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/src/render/TabPanel.js b/src/render/TabPanel.js
@@ -1137,7 +1137,9 @@ export default class TabPanel extends Component {
         else{
           if(sharedState.searchWords[tabId]){
             const navbar = refs2[`navbar-${tab.key}`].state
-            const url = navbar.historyList[navbar.currentIndex -1]
+            const currentUrl = this.getWebContents(tab).getURL()
+            const currentIndex = navbar.historyList[navbar.currentIndex][0] == currentUrl ? navbar.currentIndex : navbar.currentIndex + 1
+            const url = navbar.historyList[currentIndex -1]
             if(url && url[0].match(REG_HIGHLIGHT_SITES)){
               word = sharedState.searchWords[tabId]
             }
@@ -1290,9 +1292,9 @@ export default class TabPanel extends Component {
         console.log('onDidFinishLoading',e)
         if (!self.mounted) return
 
-        if(!sharedState.searchWordHighlightRecursive && sharedState.searchWordHighlight){
-          self.searchWordHighlight(tab)
-        }
+        // if(!sharedState.searchWordHighlightRecursive && sharedState.searchWordHighlight){
+        //   self.searchWordHighlight(tab)
+        // }
 
         ipc.send('chrome-webNavigation-onCompleted',{
           tabId:tab.wvId,
@@ -1437,7 +1439,7 @@ export default class TabPanel extends Component {
         console.log('onDomReady',e,tab,Date.now())
         if (!self.mounted) return
 
-        if(sharedState.searchWordHighlightRecursive && sharedState.searchWordHighlight){
+        if(sharedState.searchWordHighlight){
           self.searchWordHighlight(tab)
         }
 

diff --git a/tools/productionBuild.js b/tools/productionBuild.js
@@ -29,6 +29,7 @@ function escapeRegExp(string){
 
 
 function fileContentsReplace(file, reg, after) {
+  if(file.includes('tui-editor-Editor-all.min.js')) return
   if(typeof reg == "string"){
     reg = new RegExp(escapeRegExp(reg))
   }

diff --git a/tools/versionUp.js b/tools/versionUp.js
@@ -39,7 +39,8 @@ Fixed a bug in bookmark drop.
 fixed Bug of bookmark import.
 Fixed many download bugs.
 "Almost the same as as Chrome" was added to "When closing current tab, focus".
-Fixed bug that Audio Extract, and Video Converter do not start.`
+Fixed bug that Audio Extract, and Video Converter do not start.
+Fixed Search Highlight bug.`
 
 const CHANGE_JAPANESE = `Noteのmarkdownモードに行番号を追加
 Noteのmarkdownのプレビューモードをtabとverticalで切り替えるボタン(P)を追加
@@ -52,7 +53,8 @@ Top Page下部の履歴にPV、滞在時間、削除ボタンを表示するよ
 ブックマークインポートの不具合修正
 ダウンロードに関する不具合を多数修正
 「現在のタブを閉じたときのフォーカスの移動場所」に「Almost the same as Chrome」を追加
-Audio Extract, Video Converterが起動しない不具合を修正`
+Audio Extract, Video Converterが起動しない不具合を修正
+Search Highlightの不具合修正`
 
 const isWindows = process.platform === 'win32'
 const isDarwin = process.platform === 'darwin'

diff --git a/webpack.config.js b/webpack.config.js
@@ -100,8 +100,8 @@ delete baseConfig2.devtool
 // delete baseConfig.plugins
 
 module.exports = [
-  // merge({fileName:"base.js",src:path.join(__dirname,"./src/render")},baseConfig),
-  merge({fileName:"top.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),
+  merge({fileName:"base.js",src:path.join(__dirname,"./src/render")},baseConfig),
+  // merge({fileName:"top.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),
   // merge({fileName:"downloader.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),
   // merge({fileName:"download.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),
   // merge({fileName:"selector.js",src:path.join(__dirname,"./src/toolPages"),dest:path.join(__dirname,"./resource/extension/default/1.0_0/js")},baseConfig2),