From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 15 Sep 2017 14:07:00 +0000 (+0200)
Subject: page: omit numeric placeholders during edit
X-Git-Tag: v2.2~14
X-Git-Url: http://git.shiar.net/minimedit.git/commitdiff_plain/769e3ba9e234db9019a096e1d6590f902b5560e0

page: omit numeric placeholders during edit

Support automatically appended (not replaced) contents.
---

diff --git a/edit.js b/edit.js
index 8cc245c..c32bd5b 100644
--- a/edit.js
+++ b/edit.js
@@ -91,7 +91,7 @@ if (pagebody) {
 		editlink.onclick = undefined;
 		pagebody.setAttribute('contenteditable', true);
 		pagebody.innerHTML = pagebody.innerHTML
-			.replace(/<!--BLOCK ([a-z]*)-->[^]*?<!--\/-->/g, '[[$1]]');
+			.replace(/<!--BLOCK:([^-]*)-->[^]*?<!--\/-->/g, '$1');
 		CKEDITOR.inline(pagebody);
 		document.body.className = 'edit';
 		return false;
diff --git a/page.php b/page.php
index 3c0977e..c34b11c 100644
--- a/page.php
+++ b/page.php
@@ -65,7 +65,9 @@ if ($Page) {
 	{
 		$rep = [];
 		foreach ($blocks as $name => $html) {
-			$rep["[[$name]]"] = "<!--BLOCK $name-->$html<!--/-->";
+			$rep["[[$name]]"] = sprintf('<!--BLOCK:%s-->%s<!--/-->',
+				is_numeric($name) ? '' : "[[$name]]", $html
+			);
 		}
 		return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
 	}