Added partial FacilMap support #70

5 files changed, 24 insertions, 3 deletions

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 569acc49..2073abe9 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -40,6 +40,7 @@ let BYPASSTABs = [];
 
 browser.webRequest.onBeforeRequest.addListener(
   details => {
+    // console.log("url", details.url);
     const url = new URL(details.url);
     let initiator;
     if (details.originUrl)
@@ -57,7 +58,7 @@ browser.webRequest.onBeforeRequest.addListener(
 
     if (!newUrl) newUrl = instagramHelper.redirect(url, details.type, initiator);
 
-    if (mapsHelper.isMaps(url, initiator)) newUrl = mapsHelper.redirect(url);
+    if (!newUrl) newUrl = mapsHelper.redirect(url, initiator);
 
     if (!newUrl) newUrl = redditHelper.redirect(url, details.type, initiator);
 
diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html
index 810cd36e..f571b4e8 100644
--- a/src/pages/options/maps/maps.html
+++ b/src/pages/options/maps/maps.html
@@ -89,10 +89,20 @@
   </section>
 
   <section class="option-block">
+
     <div class="some-block option-block">
       <h4>Enable</h4>
       <input id="disable-osm" type="checkbox" checked />
     </div>
+
+    <div class="some-block option-block">
+      <h4>Frontend</h4>
+      <select id="maps-frontend">
+        <option value="osm">OpenStreetMap</option>
+        <option value="facil">Facil Map</option>
+      </select>
+    </div>
+
   </section>
   <script type="module" src="../init.js"></script>
   <script type="module" src="./maps.js"></script>
diff --git a/src/pages/options/maps/maps.js b/src/pages/options/maps/maps.js
index 4372567b..400d5345 100644
--- a/src/pages/options/maps/maps.js
+++ b/src/pages/options/maps/maps.js
@@ -5,6 +5,16 @@ disableMapsElement.addEventListener("change",
     (event) => mapsHelper.setDisable(!event.target.checked)
 );
 
+let mapsFrontendElement = document.getElementById("maps-frontend");
+mapsFrontendElement.addEventListener("change",
+    event => {
+        let frontend = event.target.options[mapsFrontendElement.selectedIndex].value;
+        mapsHelper.setFrontend(frontend);
+    }
+);
+
 mapsHelper.init().then(() => {
     disableMapsElement.checked = !mapsHelper.getDisable();
+    let frontend = mapsHelper.getFrontend();
+    mapsFrontendElement.value = frontend;
 })
\ No newline at end of file
diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html
index d6776e9b..a7229d02 100644
--- a/src/pages/options/reddit/reddit.html
+++ b/src/pages/options/reddit/reddit.html
@@ -112,7 +112,7 @@
     </div>
 
     <div class="some-block option-block">
-      <h4>Bypass Read on Reddit</h4>
+      <h4>Bypass "Open in Reddit"</h4>
       <input id="bypass-watch-on-reddit" type="checkbox" checked />
     </div>
 
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html
index a3151b43..3e9f228a 100644
--- a/src/pages/options/twitter/twitter.html
+++ b/src/pages/options/twitter/twitter.html
@@ -103,7 +103,7 @@
         </div>
 
         <div class="some-block option-block">
-            <h4>Bypass Watch on Twitter</h4>
+            <h4>Bypass "Open in Twitter"</h4>
             <input id="bypass-watch-on-twitter" type="checkbox" checked />
         </div>