edit: optional target upload directory

[minimedit.git] / edit.js

diff --git a/edit.js b/edit.js
index 6dcb705cee1c72e649530d8b508ce518889338cc..fcc8d5f3cb7c9ce3193079f92d597bbc9659f642 100644 (file)
--- 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
@@ -63,11 +65,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 = [