feat(startpage): cleaned up code, added popup entries

freedomgamesdev · Mar 14, 2024 · 5b83279 · 5b83279
1 parent d5aa1ca
commit 5b83279
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 143 deletions.
diff --git a/defaults.js b/defaults.js
@@ -43,7 +43,11 @@ export default function () {
             },
             ddg: {
                 mode: 'rewrite'
+            },
+	    startpage: {
+                mode: 'rewrite'
             }
+
         }
     };
 }
diff --git a/js/popup/SearchFilterSettings.js b/js/popup/SearchFilterSettings.js
@@ -25,6 +25,11 @@ export default class SearchFilterSettings {
             supportsFilter: true,
             supportsRewrite: true,
         },
+	{
+            id: 'startpage',
+            supportsFilter: true,
+            supportsRewrite: true,
+        }
     ];
 
 

diff --git a/js/search/startpage.js b/js/search/startpage.js
@@ -19,18 +19,17 @@ const wikis = prepareWikisInfo( getWikis( false, true ), {
 
 
 class DdgSearchModule extends GenericSearchModule {
-    ENGINE_LAYOUT_SELECTOR = '.w-gl--desktop';
-    RESULT_CONTAINER_SELECTOR = '.w-gl__result';
-    URL_ELEMENT_SELECTOR = '.w-gl__result-url';
-    SPAN_TITLE_ELEMENT_SELECTOR = '.w-gl__result-title > h3';
-    BADGE_ELEMENT_SELECTOR = '.w-gl__result-title';
-    ANCHOR_ELEMENT_SELECTOR = '.w-gl__result-url'; // URL breadcumb
+    ENGINE_LAYOUT_SELECTOR = '.w-gl--desktop, .w-gl';
+    RESULT_CONTAINER_SELECTOR = '.w-gl__result, .result';
+    SPAN_TITLE_ELEMENT_SELECTOR = '.w-gl__result-title > h3, .result-title > h2 ';
+    BADGE_ELEMENT_SELECTOR = this.SPAN_TITLE_ELEMENT_SELECTOR; // Element that will hold the badge.
+    ANCHOR_ELEMENT_SELECTOR = '.w-gl__result-url, .css-1su0nhd > span, .css-1qvmgy0 > span'; // URL breadcumb
     /**
      * @protected
      * @return {string}
      */
     getId() {
-        return 'ddg';
+        return 'startpage';
     }
 
 
@@ -96,7 +95,7 @@ class DdgSearchModule extends GenericSearchModule {
             allMoved: true,
             theme: {
                 fontSize: '80%',
-		color: document.documentElement.classList.contains("startpage-html--dark" || "startpage-html--night") ? '#a7b1fc' : '#000000',
+		color: document.documentElement.classList.contains("dark" || "startpage-html--night") ? '#a7b1fc' : '#000000',
 		marginBottom: '1%',
 		display: 'inline-block'
             }
@@ -110,7 +109,6 @@ class DdgSearchModule extends GenericSearchModule {
     }
 }
 
-debugger;
 document.onreadystatechange = () => {
   if (document.readyState === "complete") {
       DdgSearchModule.invoke( wikis );

diff --git a/manifests/chrome_dev.json b/manifests/chrome_dev.json