From b49b76d0bd617a2d155540cd099515f48255b50c Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Thu, 14 Sep 2017 17:41:51 +0200
Subject: [PATCH] edit: restore placeholders on edit

---
 edit.js  | 21 +++++++++------------
 page.php |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/edit.js b/edit.js
index 164cc1e..974def4 100644
--- a/edit.js
+++ b/edit.js
@@ -84,19 +84,16 @@ if (pagebody) {
 	var editlink = document.createElement('a');
 	editlink.style.cursor = 'pointer';
 	editlink.appendChild(document.createTextNode('Wijzig'));
+	editlink.href = '#edit';
 	editlink.onclick = function (e) {
-		var toggled = editlink.style.fontWeight;
-		editlink.style.fontWeight = toggled ? '' : 'bold';
-		pagebody.setAttribute('contenteditable', !toggled);
-		if (toggled) {
-			for (name in CKEDITOR.instances) {
-				CKEDITOR.instances[name].destroy()
-			}
-		}
-		else {
-			CKEDITOR.inline(pagebody);
-		}
-		document.body.className = toggled ? '' : 'edit';
+		editlink.style.fontWeight = 'bold';
+		editlink.href = '';
+		editlink.onclick = undefined;
+		pagebody.setAttribute('contenteditable', true);
+		pagebody.innerHTML = pagebody.innerHTML
+			.replace(/<!--BLOCK ([a-z]*)-->[^]*?<!--\/-->/g, '[[$1]]');
+		CKEDITOR.inline(pagebody);
+		document.body.className = 'edit';
 		return false;
 	};
 	if (window.location.hash == '#edit') {
diff --git a/page.php b/page.php
index 6d98863..9e3388e 100644
--- a/page.php
+++ b/page.php
@@ -62,7 +62,7 @@ if ($Page) {
 	{
 		$rep = [];
 		foreach ($blocks as $name => $html) {
-			$rep["[[$name]]"] = $html;
+			$rep["[[$name]]"] = "<!--BLOCK $name-->$html<!--/-->";
 		}
 		return str_replace(array_keys($rep), array_values($rep), ob_get_clean());
 	}
-- 
2.30.0