Merge pull request #9 from J4mez/dev

Fixed the scaling issues with 1.3
J4mez · Jan 22, 2024 · 49c5c4b · 49c5c4b
2 parents adbd3c5 + 93973a6
commit 49c5c4b
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 71 deletions.
diff --git a/src/manifest.json b/src/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "FireLink",
-    "version": "1.3",
+    "version": "1.4",
 
     "description": "Creates sharable links with a click of a button",
 

diff --git a/src/popup/global.js b/src/popup/global.js
@@ -95,3 +95,31 @@ function hideSuccess() {
     successMessage.textContent = "";
     successDiv.classList.add("d-none");
 }
+
+//gets the current URL and displays it in the popup. Later this will be used to generate a short URL
+const DEFAULT_URL = "https://example.com";
+
+function getDefaultUrl() {
+    let tabs = [{ url: DEFAULT_URL }];
+    return Promise.resolve(tabs[0].url);
+}
+
+async function getCurrentTabUrl() {
+    if (typeof browser === "undefined" || !browser.tabs) {
+        return getDefaultUrl();
+    }
+    try {
+        let tabs = await browser.tabs.query({
+            active: true,
+            currentWindow: true,
+        });
+        //check if the tab is valid and has http or https in the URL if not return the default URL
+        if (tabs[0].url === undefined || !tabs[0].url.startsWith("http")) {
+            return getDefaultUrl();
+        }
+        return tabs[0].url;
+    } catch (error) {
+        throw new Error("An error occurred: " + error);
+    }
+}
+
diff --git a/src/popup/index.html b/src/popup/index.html
@@ -6,7 +6,8 @@
 </head>
 <style>
     body {
-        overflow: auto;
+        overflow-y: auto;
+        max-width: 300px;
     }
 </style>
 <body class="container py-3">
@@ -20,6 +21,6 @@ <h1 class="mb-4">Share this URL!</h1>
         <button id="shareButton" class="btn btn-primary mt-3">Share URL</button>
     </div>
 </body>
-<script src="index.js"></script>
 <script src="global.js"></script>
+<script src="index.js"></script>
 </html>
diff --git a/src/popup/index.js b/src/popup/index.js
@@ -1,37 +1,15 @@
-//gets the current URL and displays it in the popup. Later this will be used to generate a short URL
-const DEFAULT_URL = "https://example.com";
-
-function getDefaultUrl() {
-    let tabs = [{ url: DEFAULT_URL }];
-    return Promise.resolve(tabs[0].url);
-}
-
-async function getCurrentTabUrl() {
-    if (typeof browser === "undefined" || !browser.tabs) {
-        return getDefaultUrl();
-    }
-    try {
-        let tabs = await browser.tabs.query({
-            active: true,
-            currentWindow: true,
-        });
-        //check if the tab is valid and has http or https in the URL if not return the default URL
-        if (
-            tabs[0].url === undefined ||
-            (!tabs[0].url.startsWith("http"))
-        ) {
-            return getDefaultUrl();
-        }
-        return tabs[0].url;
-    } catch (error) {
-        throw new Error("An error occurred: " + error);
-    }
-}
-
 getCurrentTabUrl()
     .then((currentUrl) => {
-        document.getElementById("currentUrl").textContent = ("URL to share: " + currentUrl);
+        //trimm the URL if it's loger than 50 characters
+        if (currentUrl.length > 50) {
+            var showCurrentUrl = currentUrl.substring(0, 50) + "...";
+        }
+        else {
+            var showCurrentUrl = currentUrl;
+        }
+        document.getElementById("currentUrl").textContent =
+            "URL to share: " + showCurrentUrl;
     })
     .catch((error) => {
         console.error(error);
-    });
+    });
diff --git a/src/popup/share.html b/src/popup/share.html
@@ -72,7 +72,7 @@ <h1 class="text-center">Share this URL!</h1>
                 </div>
             </div>
         </div>
-        <script src="share.js"></script>
         <script src="global.js"></script>
+        <script src="share.js"></script>
     </body>
 </html>
diff --git a/src/popup/share.js b/src/popup/share.js
@@ -1,3 +1,21 @@
+//show the current URL in the popup
+getCurrentTabUrl()
+    .then((currentUrl) => {
+        //trimm the URL if it's loger than 50 characters
+        if (currentUrl.length > 50) {
+            var showCurrentUrl = currentUrl.substring(0, 50) + "...";
+        }
+        else {
+            var showCurrentUrl = currentUrl;
+        }
+        document.getElementById("currentUrl").textContent =
+            "URL to share: " + showCurrentUrl;
+    })
+    .catch((error) => {
+        console.error(error);
+    });
+
+
 async function generateShortURL(options) {
     const longUrl = await getCurrentTabUrl();
 
@@ -41,41 +59,6 @@ function generatePreview() {
         "Preview: " + previewUrl;
 }
 
-//gets the current URL and displays it in the popup. Later this will be used to generate a short URL
-const DEFAULT_URL = "https://example.com";
-
-function getDefaultUrl() {
-    let tabs = [{ url: DEFAULT_URL }];
-    return Promise.resolve(tabs[0].url);
-}
-
-async function getCurrentTabUrl() {
-    if (typeof browser === "undefined" || !browser.tabs) {
-        return getDefaultUrl();
-    }
-    try {
-        let tabs = await browser.tabs.query({
-            active: true,
-            currentWindow: true,
-        });
-        //check if the tab is valid and has http or https in the URL if not return the default URL
-        if (tabs[0].url === undefined || !tabs[0].url.startsWith("http")) {
-            return getDefaultUrl();
-        }
-        return tabs[0].url;
-    } catch (error) {
-        throw new Error("An error occurred: " + error);
-    }
-}
-
-getCurrentTabUrl()
-    .then((currentUrl) => {
-        document.getElementById("currentUrl").textContent =
-            "URL to share: " + currentUrl;
-    })
-    .catch((error) => {
-        console.error(error);
-    });
 
 //handle the slug setting in the share form. This overrites the slug in the options page and is saved when the user clicks on the share button
 const form = document.getElementById("sharingOptionsForm");