X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/a7131e1013d54f0a6f0e80d05d04ff724d68466e..HEAD:/edit/page.js

diff --git a/edit/page.js b/edit/page.js
index b21a038..8aa2890 100644
--- a/edit/page.js
+++ b/edit/page.js
@@ -19,15 +19,20 @@ CKEDITOR.plugins.add('inlinesave', {
 				// 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;');
+				body = body.replace(/\b((?:[Dd]hr|[Mm](?:w|e?vr|r|r?ss?)|[A-Z])\.)\s+(?=[A-Zdtv])/g, '$1&nbsp;');
 				// wrap long line after each sentence
 				body = body.replace(/^(\t*).{73,}/mg, function (line, indent) {
+					if (/^<meta /.test(line)) return line; // ignore metadata headers
 					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');
 				});
 				// treat standalone placeholders as block elements
 				body = body.replace(/<p>(\[\[.*\]\])<\/p>/g, '$1');
+				// strip redundant domain in relative urls
+				var hostlink = 'https?://' + window.location.hostname.replace(/\W/g, '\\$&');
+				hostlink = new RegExp('(<a [^>]*href="|<img [^>]*src=")' + hostlink + '(?=/)', 'gi');
+				body = body.replace(hostlink, '$1');
 
 				var data = 'body='+encodeURIComponent(body);
 				var ajaxpost = new XMLHttpRequest();
@@ -53,7 +58,7 @@ CKEDITOR.plugins.add('inlinesave', {
 				ajaxpost.send(data);
 			},
 		});
-		editor.setKeystroke(CKEDITOR.CTRL + 83 /*S*/, 'inlinesave');
+		editor.setKeystroke(CKEDITOR.CTRL + 'S'.charCodeAt(0), 'inlinesave');
 		editor.ui.addButton( 'Inlinesave', {
 			command: 'inlinesave',
 			label: editor.lang.save.toolbar,
@@ -115,14 +120,26 @@ CKEDITOR.on('instanceCreated', function (event) {
 		var config = editor.config;
 		config.language = 'nl';
 		config.extraPlugins = 'inlinesave,placeholder,image2,uploadimage';
-		config.format_tags = 'h2;h3;h4;p';
-		config.allowedContent = true;
+		config.removePlugins = 'image,exportpdf'; // conflicts with imag2
+		config.allowedContent = {
+			$1: {
+				elements: CKEDITOR.dtd,
+				attributes: true,
+				styles: true,
+				classes: true,
+			},
+		};
+		config.disallowedContent = 'img[width,height]';
 		config.entities = false; // keep unicode
-		config.filebrowserImageUploadUrl = '/edit/page?output=ckescript';
-		config.uploadUrl = '/edit/page?output=ckjson';
+		config.filebrowserImageUploadUrl = '/edit/page?output=ckjson';
 		config.image2_alignClasses = ['left', 'center', 'right'];
+		config.image2_prefillDimensions = false;
 		config.image2_disableResizer = true;
 		config.stylesSet = [
+			{ name: 'Paginakop', element: 'h2' },
+			{ name: 'Paragraafkop', element: 'h3' },
+			{ name: 'Alineakop', element: 'h4' },
+
 			{ name: 'Gerelateerd', element: 'aside' },
 			{ name: 'Voetnoot', element: 'div', attributes: { 'class': 'right' } },
 			{ name: 'Kolom', element: 'div', attributes: { 'class': 'col' } },
@@ -139,11 +156,10 @@ CKEDITOR.on('instanceCreated', function (event) {
 			{ name: 'Uitgelogd', element: 'span', attributes: { 'class': 'logout' } },
 		];
 		config.pasteFilter = pastefilter;
-		config.contentsCss = document.styleSheets[0].href;
+		config.contentsCss = [...document.styleSheets].map(e => e.href).filter(Boolean);
 		config.toolbar = [
 			['Inlinesave', '-', 'Undo', 'Redo'],
-			['Format', 'Styles'],
-			['Bold', 'Italic', 'Link'],
+			['Styles', 'Bold', 'Italic', 'Link'],
 			['BulletedList', 'NumberedList', 'Blockquote'],
 			['Table', 'CreateDiv'],
 			['Image', 'HorizontalRule', 'CreatePlaceholder'],
@@ -169,8 +185,12 @@ CKEDITOR.on('instanceCreated', function (event) {
 
 if (pagebody) {
 	// add edit link to menu
-	var editlink = document.querySelector('a[href="#edit"]');
-	if (editlink)
+	var editdiv = document.querySelector('header .login > p');
+	if (!editdiv) return;
+	var editlink = editdiv.appendChild(document.createElement('a'));
+	editlink.append('\u270D');
+	editlink.className = 'icon icon-edit';
+	editlink.href = '#edit';
 	editlink.onclick = function (e) {
 		editlink.style.fontWeight = 'bold';
 		editlink.href = '';
@@ -196,8 +216,11 @@ if (pagebody) {
 
 }
 
+var ckesrc = document.currentScript.getAttribute('data-ckesrc');
 document.addEventListener('DOMContentLoaded', function (e) {
-	pagebody = editorcontents().cloneNode(true);
+	pagebody = editorcontents();
+	if (!pagebody) return;
+	pagebody = pagebody.cloneNode(true);
 	var editorinc = document.createElement('script');
 	editorinc.addEventListener('load', editorsetup);
 	editorinc.src = ckesrc;