edit: reenforce xml slash in self-closing elements

[minimedit.git] / edit.js

diff --git a/edit.js b/edit.js
index 6f9211eea2f18f8863436634ddf18d35cb172516..8cc245c64beeaf907ac16d73c7e843492a9b562e 100644 (file)
--- a/edit.js
+++ b/edit.js
@@ -42,7 +42,7 @@ CKEDITOR.on('instanceCreated', function (event) {
        editor.on('configLoaded', function () {
                var config = editor.config;
                config.language = 'nl';
-               config.extraPlugins = 'sourcedialog,inlinesave';
+               config.extraPlugins = 'sourcedialog,inlinesave,placeholder';
                config.format_tags = 'h2;h3;h4;p';
                config.allowedContent = true;
                config.entities = false; // keep unicode
@@ -54,8 +54,12 @@ CKEDITOR.on('instanceCreated', function (event) {
                        ['Format'],
                        ['BulletedList', 'NumberedList', '-', 'Blockquote'],
                        ['Bold', 'Italic', 'Underline', 'Strike', 'RemoveFormat', '-', 'Anchor', 'Link'],
-                       ['HorizontalRule', 'Table', 'Image'],
+                       ['HorizontalRule', 'Table', 'Image', 'CreatePlaceholder'],
                ];
+               config.toolbarCanCollapse = true;
+               config.floatSpacePreferRight = true;
+               config.floatSpaceDockedOffsetY = 0;
+               config.startupFocus = true;
 
                config.disableObjectResizing = true;
                document.execCommand('enableObjectResizing', false, false); // workaround in inline mode; ff bug?
@@ -65,15 +69,36 @@ CKEDITOR.on('instanceCreated', function (event) {
        CKEDITOR.on('instanceReady', function (event) {
                var editor = event.editor;
                var writer = editor.dataProcessor.writer;
-               writer.selfClosingEnd = '>';
+               writer.selfClosingEnd = ' />';
                writer.setRules( 'p', {
                        breakAfterOpen: true,
                        breakBeforeClose: true,
                });
        });
 
-var pagebody = document.getElementsByClassName('article')[0];
-pagebody.setAttribute('contenteditable', 'true');
+       CKEDITOR.disableAutoInline = true;
 
-document.body.className = 'edit';
+// 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';
+       editlink.onclick = function (e) {
+               editlink.style.fontWeight = 'bold';
+               editlink.href = '';
+               editlink.onclick = undefined;
+               pagebody.setAttribute('contenteditable', true);
+               pagebody.innerHTML = pagebody.innerHTML
+                       .replace(/<!--BLOCK ([a-z]*)-->[^]*?<!--\/-->/g, '[[$1]]');
+               CKEDITOR.inline(pagebody);
+               document.body.className = 'edit';
+               return false;
+       };
+       if (window.location.hash == '#edit') {
+               editlink.onclick();
+       }
+       document.querySelector('header ul').appendChild(editlink);
+}