X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/bd83adaa7865fbcbbc1fc4c497331e2a3ddceb37..73eec3eb33d28775d3aff4d87e3ab9399c001fed:/edit.js

diff --git a/edit.js b/edit.js
index 6dcb705..b331cf7 100644
--- a/edit.js
+++ b/edit.js
@@ -3,7 +3,9 @@ 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 dots = '(?:.{24,72}|.{73,}?)'; // chars before punctuation
 					var wrap = new RegExp('('+dots+'[.;:!?]) (?=[A-Z(<])', 'g'); // separate lines
@@ -33,13 +35,20 @@ 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;
 	}
 });
 
@@ -63,11 +72,14 @@ CKEDITOR.on('instanceCreated', function (event) {
 	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.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 = [