Merge pull request #333 from VillainsRule/about-blank-improver

Redo iframe opening
UseInterstellar · Dec 21, 2023 · 45d48d7 · 45d48d7 · hop-deploy · Dec 21, 2023
2 parents fcdd565 + d585811
commit 45d48d7
Showing 1 changed file with 10 additions and 24 deletions.
diff --git a/static/assets/scripts/home.js b/static/assets/scripts/home.js
@@ -6,31 +6,17 @@ try {
     inFrame = true;
 };
 
-if (!inFrame && !navigator.userAgent.includes("Firefox")) {
-    const popup = open("about:blank", "_blank")
-    if (!popup || popup.closed) alert("Please allow popups and redirects.")
+if (!inFrame && !navigator.userAgent.includes('Firefox')) {
+    const popup = open('about:blank', '_blank')
+    if (!popup || popup.closed) alert('Please allow popups and redirects.');
     else {
-        const doc = popup.document
-        const iframe = doc.createElement("iframe")
-        const style = iframe.style
-        const link = doc.createElement("link")
-
-        const name = localStorage.getItem("name") || "My Drive - Google Drive";
-        const icon = localStorage.getItem("icon") || "https://ssl.gstatic.com/assets/media/branding/product/1x/drive_2020q4_32dp.png";
-
-        doc.title = name;
-        link.rel = "icon";
-        link.href = icon;
-
-        iframe.src = location.href 
-        style.position = "fixed"
-        style.top = style.bottom = style.left = style.right = 0
-        style.border = style.outline = "none"
-        style.width = style.height = "100%"
-
-        doc.head.appendChild(link);
-        doc.body.appendChild(iframe);
-        location.replace(localStorage.getItem('panicLink') || 'https://www.nasa.gov/');
+        popup.document.write(`
+            <iframe src="${location.href}" style="position:fixed;top:0;left:0;width:100%;height:100%;outline:none;border:none;"></iframe>
+            <title>${localStorage.getItem('name') || 'My Drive - Google Drive'}</title>
+            <link rel="icon" href="${localStorage.getItem('icon') || 'https://ssl.gstatic.com/assets/media/branding/product/1x/drive_2020q4_32dp.png'}">
+        `);
+
+        location.replace(localStorage.getItem('panicLink') || 'https://classroom.google.com');
     };
 };