Merge pull request #23 from forgetso/22-clear-history-button-not-working

Fixes #22
forgetso · Jun 8, 2023 · e4b016d · e4b016d
2 parents a8a2359 + fba3260
commit e4b016d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 26 deletions.
diff --git a/manifest.json b/manifest.json
@@ -44,6 +44,6 @@
     "https://*/*"
   ],
   "update_url": "http://clients2.google.com/service/update2/crx",
-  "version": "1.5.3"
+  "version": "1.5.4"
 
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "search_and_replace",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "resolutions": {
     "author": "Chris Taylor <[email protected]>"
   },

diff --git a/src/background.ts b/src/background.ts
@@ -5,14 +5,17 @@ chrome.runtime.onConnect.addListener(function (port) {
     port.onMessage.addListener(function (msg) {
         if (msg['recover'] === true) {
             chrome.storage.local.get(['storage'], function (result) {
-                const storage = result['storage'] as SearchReplaceStorage
+                const storage = result['storage'] as SearchReplaceStorageItems
                 port.postMessage(storage)
             })
         } else if (msg['clearHistory'] === true) {
             chrome.storage.local.get(['storage'], function (result) {
-                const storage = result['storage'] as SearchReplaceStorage
-                storage.storage.history = []
-                chrome.storage.local.set(storage, function () {
+                const storage = result['storage'] as SearchReplaceStorageItems
+                storage.history = []
+                const searchReplaceStorage: SearchReplaceStorage = {
+                    storage,
+                }
+                chrome.storage.local.set(searchReplaceStorage, function () {
                     port.postMessage('History cleared')
                 })
             })

diff --git a/src/popup.ts b/src/popup.ts
@@ -44,7 +44,7 @@ document.addEventListener('DOMContentLoaded', function () {
         const history: SearchReplaceInstance[] = msg.history || []
         let recentSearch: SearchReplaceInstance = msg.instance
         if (history.length > 0) {
-            recentSearch = recentSearch || history[0]
+            recentSearch = history[0] || []
             restoreSearchReplaceInstance(recentSearch)
             createHistoryListItemElements(history)
         }
@@ -76,7 +76,6 @@ document.addEventListener('DOMContentLoaded', function () {
 function historyHeaderClickHandler(e) {
     const historyContent = document.getElementById('historyContent')
     if (historyContent) {
-        console.log(historyContent.style.display)
         if (historyContent.style.display === 'block') {
             historyContent.style.display = 'none'
         } else {
@@ -182,6 +181,7 @@ function removeLoader() {
 }
 
 function storeTerms(e) {
+    console.debug('storing terms')
     e = e || window.event
     if (e.keyCode === 13) {
         //if the user presses enter we want to trigger the search replace
@@ -208,27 +208,29 @@ function sendToStorage(searchReplaceInstance: SearchReplaceInstance, history: Se
     }
     port.postMessage(storageMessage)
     port.onMessage.addListener(function (msg) {
-        console.log('Message received: ' + msg)
+        console.debug('Message received: ' + msg)
     })
 }
 
 function createHistoryListItemElements(history: SearchReplaceInstance[]) {
-    const historyContent = document.getElementById('historyList')
-    if (historyContent) {
-        historyContent.innerHTML = ''
-
-        for (const [index, item] of history.entries()) {
-            const li = document.createElement('li')
-            li.setAttribute(`data-searchTerm`, item['searchTerm'])
-            li.setAttribute(`data-replaceTerm`, item['replaceTerm'])
-            for (const checkbox of CHECKBOXES) {
-                const checked = checkbox in item.options ? item.options[checkbox] : false
-                li.setAttribute(`data-${checkbox}`, String(checked))
-            }
-            li.setAttribute('class', `historyRow-${index % 2}`)
+    if (history.length > 0) {
+        const historyContent = document.getElementById('historyList')
+        if (historyContent) {
+            historyContent.innerHTML = ''
+
+            for (const [index, item] of history.entries()) {
+                const li = document.createElement('li')
+                li.setAttribute(`data-searchTerm`, item['searchTerm'])
+                li.setAttribute(`data-replaceTerm`, item['replaceTerm'])
+                for (const checkbox of CHECKBOXES) {
+                    const checked = checkbox in item.options ? item.options[checkbox] : false
+                    li.setAttribute(`data-${checkbox}`, String(checked))
+                }
+                li.setAttribute('class', `historyRow-${index % 2}`)
 
-            li.innerText = item.searchTerm + ' -> ' + item.replaceTerm
-            historyContent.appendChild(li)
+                li.innerText = item.searchTerm + ' -> ' + item.replaceTerm
+                historyContent.appendChild(li)
+            }
         }
     }
 }
@@ -248,9 +250,8 @@ function constructSearchReplaceHistory(searchReplaceInstance?: SearchReplaceInst
             historyItems = getUniqueHistoryItems(historyItems)
         }
         return historyItems
-    } else if (searchReplaceInstance) {
-        historyItems = [searchReplaceInstance]
     }
+
     return historyItems
 }