Merge branch 'refactor/byline'

index.html

@@ -43,7 +43,7 @@
 			</div>
 
 			<div id="notecontent">
-			    <textarea id="md" spellcheck="false" oninput="datachanged()" onkeydown="editorkeydown()" onclick="clickeditor()"></textarea>
+			    <textarea id="md" spellcheck="false" oninput="editorinput()" onkeydown="editorkeydown()" onclick="clickeditor()"></textarea>
 			    <div hidden id="colored"></div>
 			    <div hidden id="preview"></div>
 			</div>

main.js

@@ -314,6 +314,7 @@ var snippets = [
 function seteditorcontent(content, silent)
 {
 	md.value = content;
+	applycolors();
 	if (!silent)
 	{
 		datachanged();
@@ -1231,7 +1232,6 @@ function applystyle()
 	{
 		title.style.color = settings.accentcolor;
 	}
-	applycolors();
 }
 
 function loadsettings()
@@ -1966,166 +1966,205 @@ function rawline(index)
 	return md.value.split("\n")[index];
 }
 
-function applycolors()
+function applycolorsonline(line, index, options)
+{
+	line = escapeHtml(line);
+
+	// headings
+	if (line.startsWith("#"))
+	{
+		line = line.replace(/(#* )/, "<span style='color:" + settings.accentcolor + "'>$1</span>"); // to check!
+		line = "<span style='font-weight: bold;'>" + line + "</span>";
+	}
+
+	// bold and italics
+	var temp = line;
+	if (line.startsWith("* "))
+	{
+		temp = line.substring(2);
+	}
+	temp = temp.replace(/\*\*([^\*]*)\*\*/g, "<span style='font-weight: bold;'>&#42;&#42;$1&#42;&#42;</span>");
+	temp = temp.replace(/\*([^\*]*)\*/g, "<em>&#42;$1&#42;</em>");
+
+	if (line.startsWith("* "))
+	{
+		line = "* " + temp;
+	}
+	else
+	{
+		line = temp;
+	}
+
+	// lists
+	markerslist.forEach(marker =>
+	{
+		if (line.startsWith(marker))
+		{
+			line = line.replace(marker, "<span style='color:" + settings.accentcolor + "'>" + marker.replaceAll("*", settings.bulletrendering) + "</span>");
+		}
+	});
+
+	// md header
+	if (index == 0 && line == "---")
+	{
+		options.header = true;
+	}
+	if (options.header)
+	{
+		if (index > 0 && line == "---")
+		{
+			options.header = false;
+		}
+		line = line || "&nbsp;";
+		line = "<span style='color:lightgrey'>" + line + "</span>";
+	}
+
+	// code blocks
+	if (line.startsWith("```") && !options.code)
+	{
+		options.code = true;
+		options.language = line.substring(3);
+		line = "<span style='font-family:monospace;color:rgb(70,70,70);'>" + line;
+	}
+	else if (line == "```" && options.code)
+	{
+		options.code = false;
+		options.language = "";
+		line = line + "</span>";
+	}
+	else if (options.code)
+	{
+		//breaks html escape
+		//line = line.replace(/\b(\d+)\b/g, "<span style='color:" + settings.accentcolor + "'>$1</span>");
+		if (languagekeywords[options.language])
+		{
+			var keywords = languagekeywords[options.language];
+			keywords.forEach(keyword =>
+			{
+				var r = new RegExp("(" + keyword + ")", "ig");
+				line = line.replace(new RegExp("\\b(" + keyword + ")\\b", "ig"), "<span style='color:" + settings.accentcolor + "'><b>$1</b></span>");
+			});
+		}
+	}
+
+	// internal links
+	line = line.replace(/(\[\[.*\]\])/g, "<u>$1</u>");
+
+	// comments
+	line = line.replace(/&lt;\!--(.*)/g, "<span style='color:lightgrey'>&lt;!--$1</span>");
+
+	if (line.includes("&lt;!--") && !line.includes("--&gt;"))
+	{
+		options.comment = true;
+	}
+	else if (options.comment)
+	{
+		line = line || "&nbsp;";
+		line = "<span style='color:lightgrey'>" + line
+		if (line.includes("--&gt;"))
+		{
+			options.comment = false;
+		}
+		else
+		{
+			line += "</span>";
+		}
+	}
+
+	line = line.replace(/\-\-&gt;/g, "--&gt;</span>");
+
+	if (line.startsWith("// "))
+	{
+		line = "<span style='color:lightgrey'>" + line + "</span>";
+	}
+
+	// autocomplete snippets
+	if (index == currentline())
+	{
+		var raw = rawline(index);
+		var pos = currentcol();
+		var slashpos = raw.substring(0, pos).lastIndexOf("/");
+		if (slashpos > -1)
+		{
+			var spacepos = raw.substring(0, pos).lastIndexOf(" ");
+			if (slashpos > spacepos)
+			{
+				var snippetpart = raw.substring(slashpos);
+				var matching = snippets
+				.filter(s => s.command.startsWith(snippetpart))
+				.map(s => s.command.substring(1));
+
+				line += "<span style='color:lightgrey'>";
+				line += matching.join().substr(pos - slashpos - 1);
+				line += "</span>";
+			}
+		}
+	}
+	return line;
+}
+
+function applycolors(currentonly)
 {
 	if (!settings.colors)
 	{
 		return;
 	}
 
-	var boldstyle = "font-weight: bold;";
+	var options =
-	var lines = md.value.split("\n");
-	var header = false;
-	var code = false;
-	var comment = false;
-	var language = "";
-	var resulthtml = "";
-	lines.every( (line, i) =>
 	{
-		resulthtml += "<div id='line" + i + "'>";
+		header: false,
-		line = escapeHtml(line);
+		code: false,
+		comment: false,
+		language: ""
+	};
 
-		// headings
+	if (currentonly)
-		if (line.startsWith("#"))
+	{
+		var index = currentline();
+		var linediv = document.getElementById("line" + index);
+		options = JSON.parse(linediv.getAttribute("tag"));
+		var line = rawline(index);
+		line = applycolorsonline(line, index, options);
+		linediv.innerHTML = line || "&nbsp;";
+	}
+	else
+	{
+		console.log("redrawing all colored div");
+		var lines = md.value.split("\n");
+		var i = 0;
+		for (; i < lines.length; i++)
 		{
-			line = line.replace(/(#* )/, "<span style='color:" + settings.accentcolor + "'>$1</span>"); // to check!
+			var linediv = document.getElementById("line" + i);
-			line = "<span style='" + boldstyle + "'>" + line + "</span>";
+			if (!linediv)
-		}
-
-		// bold and italics
-		var temp = line;
-		if (line.startsWith("* "))
-		{
-			temp = line.substring(2);
-		}
-		temp = temp.replace(/\*\*([^\*]*)\*\*/g, "<span style='" + boldstyle + "'>&#42;&#42;$1&#42;&#42;</span>");
-		temp = temp.replace(/\*([^\*]*)\*/g, "<em>&#42;$1&#42;</em>");
-
-		if (line.startsWith("* "))
-		{
-			line = "* " + temp;
-		}
-		else
-		{
-			line = temp;
-		}
-
-		// lists
-		markerslist.forEach(marker =>
-		{
-			if (line.startsWith(marker))
 			{
-				line = line.replace(marker, "<span style='color:" + settings.accentcolor + "'>" + marker.replaceAll("*", settings.bulletrendering) + "</span>");
+				linediv = document.createElement("div");
+				colored.appendChild(linediv);
 			}
-		});
+			linediv.setAttribute("id", "line" + i);
+			linediv.setAttribute("tag", JSON.stringify(options));
+			linediv.innerHTML = applycolorsonline(lines[i], i, options) || "&nbsp;";
+		};
 
-		// md header
+		// remove remanining
-		if (i == 0 && line == "---")
+		linediv = document.getElementById("line" + (i++));
+		while (linediv)
 		{
-			header = true;
+			colored.removeChild(linediv);
-		}
+			linediv = document.getElementById("line" + (i++));
-		if (header)
-		{
-			if (i > 0 && line == "---")
-			{
-				header = false;
-			}
-			line = line || "&nbsp;";
-			line = "<span style='color:lightgrey'>" + line + "</span>";
 		}
+	}
+}
 
-		// code blocks
+function editorinput()
-		if (line.startsWith("```") && !code)
+{
-		{
+	// criteria to improve. Or redraw only after?
-			code = true;
+	var multiline = md.value.substring(md.selectionStart, md.selectionEnd).includes("\n");
-			language = line.substring(3);
+	applycolors(!multiline && event.data && (event.inputType == "insertText" || event.inputType == "deleteContentBackward" || event.inputType == "deleteContentForward"));
-			line = "<span style='font-family:monospace;color:rgb(70,70,70);'>" + line;
+	datachanged();
-		}
-		else if (line == "```" && code)
-		{
-			code = false;
-			language = "";
-			line = line + "</span>";
-		}
-		else if (code)
-		{
-			line = line.replace(/\b(\d+)\b/g, "<span style='color:" + settings.accentcolor + "'>$1</span>");
-			if (languagekeywords[language])
-			{
-				var keywords = languagekeywords[language];
-				keywords.forEach(keyword =>
-				{
-					var r = new RegExp("(" + keyword + ")", "ig");
-					line = line.replace(new RegExp("\\b(" + keyword + ")\\b", "ig"), "<span style='color:" + settings.accentcolor + "'><b>$1</b></span>");
-				});
-			}
-		}
-
-		// internal links
-		line = line.replace(/(\[\[.*\]\])/g, "<u>$1</u>");
-
-		// comments
-		line = line.replace(/&lt;\!--(.*)/g, "<span style='color:lightgrey'>&lt;!--$1</span>");
-
-		if (line.includes("&lt;!--") && !line.includes("--&gt;"))
-		{
-			comment = true;
-		}
-		else if (comment)
-		{
-			line = line || "&nbsp;";
-			line = "<span style='color:lightgrey'>" + line
-			if (line.includes("--&gt;"))
-			{
-				comment = false;
-			}
-			else
-			{
-				line += "</span>";
-			}
-		}
-
-		line = line.replace(/\-\-&gt;/g, "--&gt;</span>");
-
-		if (line.startsWith("// "))
-		{
-			line = "<span style='color:lightgrey'>" + line + "</span>";
-		}
-
-		// autocomplete snippets
-		if (i == currentline())
-		{
-			var raw = rawline(i);
-			var pos = currentcol();
-			var slashpos = raw.substring(0, pos).lastIndexOf("/");
-			if (slashpos > -1)
-			{
-				var spacepos = raw.substring(0, pos).lastIndexOf(" ");
-				if (slashpos > spacepos)
-				{
-					var snippetpart = raw.substring(slashpos);
-
-					var matching = snippets
-					.filter(s => s.command.startsWith(snippetpart))
-					.map(s => s.command.substring(1));
-
-					line += "<span style='color:lightgrey'>";
-					line += matching.join().substr(pos - slashpos - 1);
-					line += "</span>";
-				}
-			}
-		}
-
-		resulthtml += (line || "&nbsp;") + "</div>";
-
-		return true;
-	});
-	colored.innerHTML = resulthtml;
 }
 
 function datachanged()
 {
-	applycolors();
 	resize();
 
 	saved = false;
@@ -2738,8 +2777,6 @@ function bindfile(note)
 	setwindowtitle();
 
 	seteditorcontent(note.content || "", true);
-	applycolors();
-	preview.innerHTML = md2html(md.value);
 
 	if (changed)
 	{