Filter paragraphs and Wikipedia icon

bsogulcan · Sep 6, 2022 · b93c082 · b93c082
1 parent bb690d7
commit b93c082
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 50 deletions.
diff --git a/browserAction/index.html b/browserAction/index.html
diff --git a/browserAction/script.js b/browserAction/script.js
diff --git a/browserAction/style.css b/browserAction/style.css
diff --git a/content_script.js b/content_script.js
@@ -53,6 +53,13 @@ function onDataReceived(contentInfo) {
     el.innerHTML = contentInfo.data;
     paragraphs = el.getElementsByTagName('p');
 
+    const paragraphList = Object.keys(paragraphs).map(index => {
+        let paragraph = paragraphs[index];
+        return paragraph;
+    });
+
+    paragraphs = paragraphList.filter(x => x.innerText.length > 0 && x.className != 'mw-empty-elt' && !x.innerText.includes('Other reasons this message may be displayed'));
+
     let wikiResultHtml = wikiResultBaseHtml.replace('{{top}}', (clientY - 40))
         .replace('{{left}}', clientX);
     const wikiResult = document.createElement('span');
@@ -64,15 +71,23 @@ function onDataReceived(contentInfo) {
 
     const wikiResultTitle = document.getElementById('wiki-result-title');
     wikiResultTitle.innerText = contentInfo.selectedText;
+    wikiResultTitle.href = 'www.google.com';
 
     const wikiResultContent = document.getElementById('wiki-result-content');
     const contentItem = document.createElement('p');
-    contentItem.innerText = paragraphs[0]?.innerText;
-    wikiResultContent.appendChild(contentItem);
-    lastParagraphIndex = 0;
 
     const wikiResultLoadModeButton = document.getElementById('wiki-result-load-more');
     wikiResultLoadModeButton.addEventListener("click", wikiLoadMore.bind(null), false);
+
+    if (paragraphs.length != 0) {
+        contentItem.innerText = paragraphs[0]?.innerText;
+    } else {
+        contentItem.innerText = 'Wikipedia does not have an article with this exact name.';
+        wikiResultLoadModeButton.remove();
+    }
+
+    wikiResultContent.appendChild(contentItem);
+    lastParagraphIndex = 0;
 };
 
 function wikiResultClose() {

diff --git a/icons/icon.png b/icons/icon.png
diff --git a/icons/wikipedia-0.png b/icons/wikipedia-0.png
diff --git a/icons/wikipedia-1.png b/icons/wikipedia-1.png
diff --git a/icons/wikipedia-2.png b/icons/wikipedia-2.png
diff --git a/manifest.json b/manifest.json
@@ -2,9 +2,9 @@
   "manifest_version": 3,
   "name": "AskWiki",
   "description": "Learn from Wikipedia",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "icons": {
-    "64": "icons/icon.png"
+    "64": "icons/wikipedia-0.png"
   },
   "background": {
     "service_worker": "background_script.js"
@@ -24,9 +24,8 @@
     }
   ],
   "action": {
-    "default_popup": "browserAction/index.html",
     "default_icon": {
-      "64": "icons/icon.png"
+      "64": "icons/wikipedia-0.png"
     },
     "default_title": "AskWiki"
   },

diff --git a/options/index.html b/options/index.html
diff --git a/options/script.js b/options/script.js
diff --git a/options/style.css b/options/style.css
diff --git a/pageAction/index.html b/pageAction/index.html
diff --git a/pageAction/script.js b/pageAction/script.js
diff --git a/pageAction/style.css b/pageAction/style.css