X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/77463c39a28eb150da1dd73af00bc4f6d17e23f2..9be973973162c972e1bbaac46ccdf82049f75e7c:/edit.js

diff --git a/edit.js b/edit.js
index 1b71547..5384f2c 100644
--- a/edit.js
+++ b/edit.js
@@ -9,7 +9,7 @@ CKEDITOR.plugins.add('inlinesave', {
 				// wrap long line after each sentence
 				body = body.replace(/^(\t*).{73,}/mg, function (line, indent) {
 					var dots = '(?:.{24,72}|.{73,}?)'; // chars before punctuation
-					var wrap = new RegExp('('+dots+'[.;:!?]) (?=[A-Z(<])', 'g'); // separate lines
+					var wrap = new RegExp('('+dots+'[.:!?]) (?=[A-Z(<])', 'g'); // separate lines
 					return line.replace(wrap, '$1\n'+indent+'\t');
 				});
 				// treat standalone placeholders as block elements
@@ -76,7 +76,7 @@ CKEDITOR.on('instanceCreated', function (event) {
 	editor.on('configLoaded', function () {
 		var config = editor.config;
 		config.language = 'nl';
-		config.extraPlugins = 'sourcedialog,inlinesave,placeholder,image2,uploadimage';
+		config.extraPlugins = 'inlinesave,placeholder,image2,uploadimage';
 		config.format_tags = 'h2;h3;h4;p';
 		config.allowedContent = true;
 		config.entities = false; // keep unicode
@@ -92,10 +92,13 @@ CKEDITOR.on('instanceCreated', function (event) {
 		config.contentsCss = document.styleSheets[0].href;
 		config.toolbar = [
 			['Inlinesave', '-', 'Undo', 'Redo'],
-			['Format', 'BulletedList', 'NumberedList', 'CreateDiv', 'Table', 'Blockquote'],
-			['HorizontalRule', 'CreatePlaceholder', 'Image'],
+			['Format'],
 			['Bold', 'Italic', 'Link'],
-			['Sourcedialog'],
+			['BulletedList', 'NumberedList', 'Blockquote'],
+			['Table', 'CreateDiv'],
+			['Image', 'HorizontalRule', 'CreatePlaceholder'],
+//			['Sourcedialog'],
+			['closebtn'],
 		];
 		config.toolbarCanCollapse = true;
 		config.floatSpacePreferRight = true;
@@ -126,8 +129,8 @@ if (pagebody) {
 		editlink.onclick = undefined;
 		pagebody.setAttribute('contenteditable', true);
 		pagebody.innerHTML = pagebody.innerHTML
-			.replace(/<!--BLOCK:([^-]*)-->[^]*?<!--\/-->/g, '$1');
-		CKEDITOR.inline(pagebody);
+			.replace(/<!--BLOCK:(.*?)-->[^]*?<!--\/-->/g, '$1');
+		CKEDITOR.inline(pagebody, { customConfig: '' });
 		document.body.className = 'edit';
 		return false;
 	};