Bug Fixes, add smod.js

Author: petabyt

ScratchFormat.zip

@@ -4,6 +4,11 @@ var formatter;
 // Everything is customizable here.
 // (local images don't work yet, but who cares.
 // this is the internet.)
+var version = 3;
+if (document.body.children[0].id == "pagewrapper") {
+	version = 2;
+}
+
 var tags = [
 	{
 		"name": "bold",
@@ -92,7 +97,10 @@ setTimeout(function() {
 		if (tags[t].help) {
 			icon.style.float = "right";
 			icon.onclick = function() {
-				window.open("https://github.com/ScratchFormat/ScratchFormat2/issues");
+				smod.dialogText("ScratchFormat Help", `
+<a href="https://github.com/ScratchFormat/ScratchFormat2/issues" style="color: #12b1e4;">Report issues at our Github</a>
+If you do not own a Github account, simply comment on my profile <a href="https://scratch.mit.edu/users/pufflegamerz/" style="color: #12b1e4;">@pufflegamerz</a>
+				`, version);
 			}
 
 			formatter.appendChild(icon);

javascript.js

@@ -0,0 +1,7 @@
+{var s = document.createElement('script');
+s.src = chrome.extension.getURL('smod.js');
+(document.head||document.documentElement).appendChild(s);}
+
+{var s = document.createElement('script');
+s.src = chrome.extension.getURL('javascript.js');
+(document.head||document.documentElement).appendChild(s);}

loader.js

@@ -5,10 +5,11 @@
   "content_scripts": [
     {
       "matches": ["https://scratch.mit.edu/users*","https://scratch.mit.edu/studios*", "https://scratch.mit.edu/projects*"],
-      "js": ["javascript.js"],
+      "js": ["loader.js"],
       "css": ["style.css"]
     }
   ],
+  "web_accessible_resources": ["smod.js", "javascript.js"],
   "browser_action": {
     "default_title": "ScratchFormat",
     "default_icon": "logo.png",

manifest.json

@@ -0,0 +1,48 @@
+// Copyleft Daniel C 2020
+// GNU General Public License v2.0
+
+var smod = {
+	dialog2: function(title, element) {
+		openDialogue(element, {
+			title: gettext(title),
+
+			open: function(e, t) {
+				// Keeping for future reference
+			},
+
+			close: function(e, t) {
+				$(this).dialog("destroy");
+				$(".ui-widget-overlay.ui-front").remove();
+			},
+
+			show: {
+				effect: "clip",
+				duration: 250
+			},
+
+			hide: {
+				effect: "clip",
+				duration: 250
+			}
+		});
+	},
+
+	// This is bad, bad, bad. If anybody can find the native
+	// way to create popups in Scratch 3.0 React.js, let me know.
+	dialog3: function(title, text) {
+		var html = `"<div class="ReactModalPortal"><div class="modal-overlay modal-overlay"><div aria-label="Report Comment" class="modal-content mod-report modal-sizes modal-content mod-report" role="dialog" tabindex="-1"><div class="modal-content-close" onclick="this.parentElement.parentElement.style.display = 'none';"><img alt="close-icon" class="modal-content-close-img" draggable="true" src="/svgs/modal/close-x.svg"></div><div><div class="report-modal-header" style="background-color: #395c79; box-shadow: inset 0 -1px 0 0 #001fff;"><div class="report-content-label"><span>` + title + `</span></div></div><div class="report-modal-content" style="padding-bottom: 50px;"><div><div class="instructions"><span>` + text +`</span></div></div></div></div></div></div>"</div>`;
+		document.body.innerHTML += html;
+	},
+
+	dialogText: function(title, text, version) {
+		// A good way to check 2.0 vs 3.0 is
+		// window["openDialogue"] == undefined
+		if (version == 3) {
+			this.dialog3(title, text);
+		} else {
+			var popupContent = document.createElement("div");
+			popupContent.innerHTML = text;
+			this.dialog2(title, popupContent);
+		}
+	}
+}