Mainance and 2.2 prep update

petabyt · petabyt · commit df0aecfd6df3 · 2020-08-25T13:02:53.000-04:00
diff --git a/javascript.js b/javascript.js
@@ -81,7 +81,7 @@ sf.tags = [
 	{
 		"name": "help",
 		"help": true,
-		"src": "https://raw.githubusercontent.com/Remix-Design/RemixIcon/master/icons/Development/bug-line.svg",
+		"src": "https://raw.githubusercontent.com/Remix-Design/RemixIcon/master/icons/Editor/question-mark.svg",
 		"ignore": true
 	}
 ];
@@ -112,7 +112,7 @@ sf.init = function() {
 		icon.src = sf.tags[t].src;
 
 		// Help icon
-		if (sf.tags[t].help) {
+		if (sf.tags[t].help == true) {
 			icon.style.float = "right";
 			icon.onclick = function() {
 				// Popup message HTML got a bit out of hand here
@@ -179,6 +179,8 @@ sf.init = function() {
 			if (event.target.parentElement.children[0].id !== "formatter") {
 				event.target.parentElement.prepend(sf.formatter);
 				sf.formatter.style.width = event.target.offsetWidth + "px";
+				event.target.style.resize = "auto";
+
 			}
 		}
 	}
@@ -216,6 +218,13 @@ sf.format = function() {
 	}
 }
 
+sf.parseMD = function(text) {
+	// Bold, then italics
+	text = text.replace(/\*\*(.*)\*\*/gm, "<b>$1</b>");
+	text = text.replace(/\*(.*)\*/gm, "<b>$1</b>");
+	return text;
+}
+
 // Custom regex SFML* parser. It parses differently than HTML. Instead
 // Of replacing [b] with <b>, it it replaces both tags with
 // text between them. Therefore, "[b][b]Hello[/b][/b]" will not work.
@@ -262,5 +271,7 @@ sf.parse = function(text) {
 	// Format trailing breaklines and spaces
 	text = text.replace(/^(\n| )+/gm, "");
 
+	text = sf.parseMD(text);
+
 	return text;
 }
diff --git a/logo.png b/logo.png
diff --git a/popup.html b/popup.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
+<html>
 <head>
 </head>
 <body>
 	<center>
-		<img src="logo.png">
-		<h2>ScratchFormat 2.1</h2>
+		<img src="logo.png" width="200">
+		<h2>ScratchFormat 2.2</h2>
 		<p>
 			Thank you for using ScratchFormat. <b>To use it, go
 			on a scratch comment editor and click on it.</b> The formatter
@@ -20,9 +21,9 @@ <h2>ScratchFormat 2.1</h2>
 </body>
 <style>
 	html {
-		width: 200px;
-		height: 350px;
+
 		background-color: lightblue;
 	}
 </style>
 <script type="text/javascript" src="javascript.js"></script>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ sf.tags = [`
`81`	`81`	`{`
`82`	`82`	`"name": "help",`
`83`	`83`	`"help": true,`
`84`		`- "src": "https://raw.githubusercontent.com/Remix-Design/RemixIcon/master/icons/Development/bug-line.svg",`
	`84`	`+ "src": "https://raw.githubusercontent.com/Remix-Design/RemixIcon/master/icons/Editor/question-mark.svg",`
`85`	`85`	`"ignore": true`
`86`	`86`	`}`
`87`	`87`	`];`
`@@ -112,7 +112,7 @@ sf.init = function() {`
`112`	`112`	`icon.src = sf.tags[t].src;`
`113`	`113`
`114`	`114`	`// Help icon`
`115`		`- if (sf.tags[t].help) {`
	`115`	`+ if (sf.tags[t].help == true) {`
`116`	`116`	`icon.style.float = "right";`
`117`	`117`	`icon.onclick = function() {`
`118`	`118`	`// Popup message HTML got a bit out of hand here`
`@@ -179,6 +179,8 @@ sf.init = function() {`
`179`	`179`	`if (event.target.parentElement.children[0].id !== "formatter") {`
`180`	`180`	`event.target.parentElement.prepend(sf.formatter);`
`181`	`181`	`sf.formatter.style.width = event.target.offsetWidth + "px";`
	`182`	`+ event.target.style.resize = "auto";`
	`183`	`+`
`182`	`184`	`}`
`183`	`185`	`}`
`184`	`186`	`}`
`@@ -216,6 +218,13 @@ sf.format = function() {`
`216`	`218`	`}`
`217`	`219`	`}`
`218`	`220`
	`221`	`+sf.parseMD = function(text) {`
	`222`	`+ // Bold, then italics`
	`223`	`+ text = text.replace(/\\(.)\\*/gm, "<b>$1</b>");`
	`224`	`+ text = text.replace(/\(.)\*/gm, "<b>$1</b>");`
	`225`	`+ return text;`
	`226`	`+}`
	`227`	`+`
`219`	`228`	`// Custom regex SFML* parser. It parses differently than HTML. Instead`
`220`	`229`	`// Of replacing [b] with <b>, it it replaces both tags with`
`221`	`230`	`// text between them. Therefore, "[b][b]Hello[/b][/b]" will not work.`
`@@ -262,5 +271,7 @@ sf.parse = function(text) {`
`262`	`271`	`// Format trailing breaklines and spaces`
`263`	`272`	`text = text.replace(/^(\n\| )+/gm, "");`
`264`	`273`
	`274`	`+ text = sf.parseMD(text);`
	`275`	`+`
`265`	`276`	`return text;`
`266`	`277`	`}`