edit/page: load ckeditor dependency from script include

Adapted from poslawsky.nl change, but retaining variable source.

diff --git a/edit/page.js b/edit/page.js
index d1f16bf3c2b705d3323de6fb7963d010d5b0d440..ecf520453fb4ffffb6039895600d1725beb2f469 100644 (file)
--- a/edit/page.js
+++ b/edit/page.js
@@ -1,3 +1,7 @@
+function editorsetup() {
+
+CKEDITOR.disableAutoInline = true;
+
 CKEDITOR.plugins.add('inlinesave', {
        init: function(editor) {
                editor.addCommand( 'inlinesave', {
@@ -153,11 +157,9 @@ CKEDITOR.on('instanceCreated', function (event) {
        };
 });
 
-       CKEDITOR.disableAutoInline = true;
-
-// add edit link to menu
 var pagebody = document.getElementsByClassName('static')[0];
 if (pagebody) {
+       // add edit link to menu
        var editlink = document.querySelector('a[href="#edit"]');
        if (editlink)
        editlink.onclick = function (e) {
@@ -182,3 +184,11 @@ if (pagebody) {
        }
 }
 
+}
+
+document.addEventListener('DOMContentLoaded', function (e) {
+       var editorinc = document.createElement('script');
+       editorinc.addEventListener('load', editorsetup);
+       editorinc.src = ckesrc;
+       document.getElementsByTagName('head')[0].appendChild(editorinc);
+});

diff --git a/page.inc.php b/page.inc.php
index c21b4e7b9f45dfcef645e9839dc375b417864370..ae223f1a1f5383f6ca2dbf795f82a7eb27f87940 100644 (file)
--- a/page.inc.php
+++ b/page.inc.php
@@ -52,7 +52,7 @@ register_shutdown_function(function () {
                if (!file_exists(DOCROOT . $ckesrc)) {
                        $ckesrc = '//cdn.ckeditor.com/4.7.3/full-all'; # remote fallback
                }
-               printf('<script src="%s"></script>'."\n", "$ckesrc/ckeditor.js");
+               printf("<script>var ckesrc = '%s'</script>\n", "$ckesrc/ckeditor.js");
                print '<script src="/edit/page.js"></script>'."\n";
        }