final polishing of the code, and add a <code> option

petabyt · petabyt · commit 664765189584 · 2020-06-23T16:45:29.000-04:00
diff --git a/javascript.js b/javascript.js
@@ -42,6 +42,15 @@ sf.tags = [
 			return "<u>" + part2 + "</u>";
 		}
 	},
+	{
+		"name": "code",
+		"tag": "code",
+		"src": "https://raw.githubusercontent.com/Remix-Design/RemixIcon/master/icons/Editor/code-view.svg",
+		"fillers": ["[code]", "[/code]"],
+		"formatter": function(part1, part2) {
+			return "<code>" + part2 + "</code>";
+		}
+	},
 	{
 		"name": "color",
 		"tag": "color",
@@ -243,8 +252,8 @@ sf.parse = function(text) {
 			regex += sf.tags[t].tag;
 			regex += endBracket;
 		}
-
-		regex = new RegExp(regex, "gm");
+		
+		regex = new RegExp(regex, "gms");
 		text = text.replace(regex, sf.tags[t].formatter("$1", "$2"));
 	}
 
diff --git a/loader.js b/loader.js
@@ -1,9 +1,9 @@
 // Loads javascript onto page
-// Dirty method.
-{var s = document.createElement('script');
-s.src = chrome.extension.getURL('smod.js');
-(document.head||document.documentElement).appendChild(s);}
+var scripts = ["smod.js", "javascript.js"];
 
-{var s = document.createElement('script');
-s.src = chrome.extension.getURL('javascript.js');
-(document.head||document.documentElement).appendChild(s);}
+for (var s = 0; s < scripts.length; s++) {
+	var script = document.createElement("script");
+	script.src = chrome.extension.getURL(scripts[s]);
+
+	document.head.appendChild(script);
+}
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "ScratchFormat",
   "description": "Rich text editing in Scratch.",
-  "version": "20.0",
+  "version": "21.0",
   "content_scripts": [
     {
       "matches": ["https://scratch.mit.edu/users*","https://scratch.mit.edu/studios*", "https://scratch.mit.edu/projects*"],
diff --git a/popup.html b/popup.html
@@ -3,7 +3,7 @@
 <body>
 	<center>
 		<img src="logo.png">
-		<h2>ScratchFormat 2.0</h2>
+		<h2>ScratchFormat 2.1</h2>
 		<p>
 			Thank you for using ScratchFormat. <b>To use it, go
 			on a scratch comment editor and click on it.</b> The formatter
diff --git a/smod.js b/smod.js
@@ -30,7 +30,6 @@ var smod = {
 	// 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) {
-		console.log("asd");
 		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.parentElement.outerHTML = null;"><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;
 	},

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ScratchFormat",`
`3`	`3`	`"description": "Rich text editing in Scratch.",`
`4`		`- "version": "20.0",`
	`4`	`+ "version": "21.0",`
`5`	`5`	`"content_scripts": [`
`6`	`6`	`{`
`7`	`7`	`"matches": ["https://scratch.mit.edu/users","https://scratch.mit.edu/studios", "https://scratch.mit.edu/projects*"],`