X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/6bf2e9ba6bd29e744d0e205dc9cb88fa15a3f575..cabf3de4ee3cfb325e91a5e043231c2523e0169f:/edit.js

diff --git a/edit.js b/edit.js
index 164cc1e..120b68f 100644
--- a/edit.js
+++ b/edit.js
@@ -3,7 +3,13 @@ CKEDITOR.plugins.add('inlinesave', {
 		editor.addCommand( 'inlinesave', {
 			exec: function (editor) {
 				var pagename = window.location.pathname.replace(/\/$/, '/index');
-				var data = 'body='+encodeURIComponent(editor.getData());
+				var body = editor.getData().replace(/^(\t*).{73,}/mg, function (line, indent) {
+					// wrap long line after each sentence
+					var dots = '(?:.{24,72}|.{73,}?)'; // chars before punctuation
+					var wrap = new RegExp('('+dots+'[.;:!?]) (?=[A-Z(<])', 'g'); // separate lines
+					return line.replace(wrap, '$1\n'+indent+'\t');
+				});
+				var data = 'body='+encodeURIComponent(body);
 				ajaxpost = new XMLHttpRequest();
 				ajaxpost.open('POST', '/edit'+pagename, true);
 				ajaxpost.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
@@ -42,19 +48,19 @@ CKEDITOR.on('instanceCreated', function (event) {
 	editor.on('configLoaded', function () {
 		var config = editor.config;
 		config.language = 'nl';
-		config.extraPlugins = 'sourcedialog,inlinesave';
+		config.extraPlugins = 'sourcedialog,inlinesave,placeholder';
 		config.format_tags = 'h2;h3;h4;p';
 		config.allowedContent = true;
 		config.entities = false; // keep unicode
 		config.filebrowserImageUploadUrl = '/edit?type=img';
 		config.forcePasteAsPlainText = true;
-		config.contentsCss = '/excelsior.css';
+		config.contentsCss = document.styleSheets[0].href;
 		config.toolbar = [
-			['Inlinesave', '-', 'ShowBlocks', 'Sourcedialog', '-', 'Undo', 'Redo'],
-			['Format'],
-			['BulletedList', 'NumberedList', '-', 'Blockquote'],
-			['Bold', 'Italic', 'Underline', 'Strike', 'RemoveFormat', '-', 'Anchor', 'Link'],
+			['Inlinesave', '-', 'Undo', 'Redo'],
+			['Format', 'BulletedList', 'NumberedList', 'Blockquote'],
+			['Bold', 'Italic', 'Link', '-', 'Underline', 'Strike'],
 			['HorizontalRule', 'Table', 'Image'],
+			['CreatePlaceholder', 'Sourcedialog'],
 		];
 		config.toolbarCanCollapse = true;
 		config.floatSpacePreferRight = true;
@@ -66,42 +72,25 @@ CKEDITOR.on('instanceCreated', function (event) {
 	});
 });
 
-	CKEDITOR.on('instanceReady', function (event) {
-		var editor = event.editor;
-		var writer = editor.dataProcessor.writer;
-		writer.selfClosingEnd = '>';
-		writer.setRules( 'p', {
-			breakAfterOpen: true,
-			breakBeforeClose: true,
-		});
-	});
-
 	CKEDITOR.disableAutoInline = true;
 
 // add edit link to menu
 var pagebody = document.getElementsByClassName('static')[0];
 if (pagebody) {
-	var editlink = document.createElement('a');
-	editlink.style.cursor = 'pointer';
-	editlink.appendChild(document.createTextNode('Wijzig'));
+	var editlink = document.querySelector('a[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:([^-]*)-->[^]*?<!--\/-->/g, '$1');
+		CKEDITOR.inline(pagebody);
+		document.body.className = 'edit';
 		return false;
 	};
 	if (window.location.hash == '#edit') {
 		editlink.onclick();
 	}
-	document.querySelector('header ul').appendChild(editlink);
 }