X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/b3c4c38b834b8647f7c93f8326cce55b0ea47d28..v3.0-24-g48ed0c2512:/edit.js

diff --git a/edit.js b/edit.js
index b97ed87..b331cf7 100644
--- a/edit.js
+++ b/edit.js
@@ -3,11 +3,12 @@ CKEDITOR.plugins.add('inlinesave', {
 		editor.addCommand( 'inlinesave', {
 			exec: function (editor) {
 				var pagename = window.location.pathname.replace(/\/$/, '/index');
-				var body = editor.getData().replace(/^(\t*).{73,}/mg, function (line, indent) {
+				var body = editor.getData();
+				body = body.replace(/<br \/>\s*<br \/>/g, '<p>');
+				body = body.replace(/^(\t*).{73,}/mg, function (line, indent) {
 					// wrap long line after each sentence
-					var dot = '(?:[^<]|<[^>]*>)'; // one character
-					var dots = '(?:'+dot+'{24,72}|'+dot+'{73,}?)'; // chars before punctuation
-					var wrap = new RegExp('('+dots+'[.;:!?]) (?=[A-Z])', 'g'); // separate lines
+					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);
@@ -20,7 +21,7 @@ CKEDITOR.plugins.add('inlinesave', {
 					if (ajaxpost.status != 200)
 						alert('Foutcode '+ajaxpost.status+' bij opslaan: '+ajaxpost.responseText);
 					else
-						alert('Pagina is goed opgeslagen');
+						editor.resetDirty();
 				};
 				ajaxpost.send(data);
 			},
@@ -34,34 +35,59 @@ CKEDITOR.plugins.add('inlinesave', {
 });
 
 CKEDITOR.on('dialogDefinition', function (event) {
-	if (event.data.name === 'table') {
+	switch (event.data.name) {
+	case 'table':
 		// override initial attribute values
 		var infoTab = event.data.definition.getContents('info');
 		infoTab.get('txtWidth').default = '';
 		infoTab.get('txtBorder').default = '0';
 		infoTab.get('txtCellSpace').default = '';
 		infoTab.get('txtCellPad').default = '';
+		break;
+	case 'link':
+		// remove unneeded widgets from the Link Info tab
+		var infotab = event.data.definition.getContents('info');
+		infotab.remove('linkType');
+		break;
 	}
 });
 
 CKEDITOR.on('instanceCreated', function (event) {
 	var editor = event.editor;
+	var pastefilter = 'h2 h3 p ul ol li blockquote em i strong b; a[!href]; img[alt,!src]';
+
+	editor.on('paste', function (e) {
+		var html = e.data.dataValue;
+		if (!/<[^>]* style="/.test(html) && !/<font/.test(html)) return;
+
+		// force pasteFilter on contents containing styling attributes
+		var filter = new CKEDITOR.filter(pastefilter),
+			fragment = CKEDITOR.htmlParser.fragment.fromHtml(html),
+			writer = new CKEDITOR.htmlParser.basicWriter();
+		filter.applyTo(fragment);
+		fragment.writeHtml(writer);
+		e.data.dataValue = writer.getHtml();
+	});
+
 	editor.on('configLoaded', function () {
 		var config = editor.config;
 		config.language = 'nl';
-		config.extraPlugins = 'sourcedialog,inlinesave,placeholder';
+		config.extraPlugins = 'sourcedialog,inlinesave,placeholder,image2,uploadimage';
 		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.filebrowserImageUploadUrl = '/edit?output=ckescript';
+		config.uploadUrl = '/edit?output=ckjson';
+		config.image2_alignClasses = ['left', 'center', 'right'];
+		config.image2_disableResizer = true;
+		config.pasteFilter = pastefilter;
+		config.contentsCss = document.styleSheets[0].href;
 		config.toolbar = [
-			['Inlinesave', '-', 'ShowBlocks', 'Sourcedialog', '-', 'Undo', 'Redo'],
-			['Format'],
-			['BulletedList', 'NumberedList', '-', 'Blockquote'],
-			['Bold', 'Italic', 'Underline', 'Strike', 'RemoveFormat', '-', 'Anchor', 'Link'],
-			['HorizontalRule', 'Table', 'Image', 'CreatePlaceholder'],
+			['Inlinesave', '-', 'Undo', 'Redo'],
+			['Format', 'BulletedList', 'NumberedList', 'Blockquote'],
+			['Bold', 'Italic', 'Link'],
+			['HorizontalRule', 'Table', 'Image'],
+			['CreatePlaceholder', 'Sourcedialog'],
 		];
 		config.toolbarCanCollapse = true;
 		config.floatSpacePreferRight = true;
@@ -71,6 +97,12 @@ CKEDITOR.on('instanceCreated', function (event) {
 		config.disableObjectResizing = true;
 		document.execCommand('enableObjectResizing', false, false); // workaround in inline mode; ff bug?
 	});
+
+	window.onbeforeunload = function () {
+		if (editor.checkDirty()) {
+			return 'Pagina verlaten zonder wijzigingen op te slaan?'; // message ignored in modern browsers
+		}
+	};
 });
 
 	CKEDITOR.disableAutoInline = true;
@@ -78,10 +110,7 @@ CKEDITOR.on('instanceCreated', function (event) {
 // 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'));
-	editlink.href = '#edit';
+	var editlink = document.querySelector('a[href="#edit"]');
 	editlink.onclick = function (e) {
 		editlink.style.fontWeight = 'bold';
 		editlink.href = '';
@@ -96,6 +125,5 @@ if (pagebody) {
 	if (window.location.hash == '#edit') {
 		editlink.onclick();
 	}
-	document.querySelector('header ul').appendChild(editlink);
 }