X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/4c23deb380856076ebe30ab8f5f2e8916c9f7096..8da4e3db153de18c026cc8dda79bdc0947663c8a:/edit/page.js

diff --git a/edit/page.js b/edit/page.js
index 5e38383..d1f16bf 100644
--- a/edit/page.js
+++ b/edit/page.js
@@ -2,10 +2,14 @@ CKEDITOR.plugins.add('inlinesave', {
 	init: function(editor) {
 		editor.addCommand( 'inlinesave', {
 			exec: function (editor) {
-				var pagename = window.location.pathname.replace(/\/$/, '/index');
+				var pagename = window.location.pathname;
 				var body = editor.getData();
+				// trim trailing whitespace in non-empty paragraphs
+				body = body.replace(/((?!<p>).{3})(?:\s|\u200B)+(?=<\/p>)/g, '$1');
 				// empty line is equivalent to a paragraph break
 				body = body.replace(/<br \/>\s*<br \/>/g, '<p>');
+				// keep names and preceding abbreviations together
+				body = body.replace(/\b((?:dhr|mw|me?vr|mr?s?)\.)\s+(?=[A-Z])/ig, '$1&nbsp;');
 				// wrap long line after each sentence
 				body = body.replace(/^(\t*).{73,}/mg, function (line, indent) {
 					var dots = '(?:.{24,72}|.{73,}?)'; // chars before punctuation
@@ -39,6 +43,7 @@ CKEDITOR.plugins.add('inlinesave', {
 				ajaxpost.send(data);
 			},
 		});
+		editor.setKeystroke(CKEDITOR.CTRL + 83 /*S*/, 'inlinesave');
 		editor.ui.addButton( 'Inlinesave', {
 			command: 'inlinesave',
 			label: editor.lang.save.toolbar,
@@ -160,8 +165,14 @@ if (pagebody) {
 		editlink.href = '';
 		editlink.onclick = undefined;
 		pagebody.setAttribute('contenteditable', true);
-		pagebody.innerHTML = pagebody.innerHTML
-			.replace(/<!--BLOCK:(.*?)-->[^]*?<!--\/-->/g, '$1');
+		pagebody.querySelectorAll('[data-dyn]').forEach(function (el) {
+			let blockname = el.getAttribute('data-dyn');
+			if (!blockname) {
+				el.remove();
+				return;
+			}
+			el.outerHTML = '[[' + blockname + ']]';
+		});
 		CKEDITOR.inline(pagebody, { customConfig: '' });
 		document.body.className = 'edit';
 		return false;