Index: openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl,v diff -u -N -r1.14.2.13 -r1.14.2.14 --- openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 21 May 2021 07:40:57 -0000 1.14.2.13 +++ openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 22 Jul 2021 20:11:39 -0000 1.14.2.14 @@ -24,15 +24,15 @@ # config file: # # ns_section ns/server/${server}/acs/richtext-ckeditor - # ns_param CKEditorVersion 4.15.1 + # ns_param CKEditorVersion 4.16.1 # ns_param CKEditorPackage full # ns_param CKFinderURL /acs-content-repository/ckfinder # ns_param StandardPlugins uploadimage # set ::richtext::ckeditor4::version [parameter::get \ -package_id $package_id \ -parameter CKEditorVersion \ - -default 4.15.1] + -default 4.16.1] set ::richtext::ckeditor4::ckfinder_url [parameter::get \ -package_id $package_id \ @@ -234,7 +234,9 @@ set cdn //cdn.ckeditor.com/ set suffix $version/$ck_package/ckeditor.js - + ns_log notice "CKeditor4: check for locally installed file" \ + $resourceDir/$version/$ck_package -> \ + [file exists $resourceDir/$version/$ck_package] if {[file exists $resourceDir/$version/$ck_package]} { set prefix $resourceUrl/$version set cdnHost "" Index: openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/download.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/download.tcl,v diff -u -N -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/download.tcl 9 Feb 2020 15:48:07 -0000 1.2.2.1 +++ openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/download.tcl 22 Jul 2021 20:11:39 -0000 1.2.2.2 @@ -3,7 +3,7 @@ @creation-date Jan 04, 2017 } { - {ck_package:word,notnull ""} + {ck_package:token,notnull ""} {version:word,notnull ""} } Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v diff -u -N -r1.284.2.163 -r1.284.2.164 --- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 2 Jul 2021 16:33:11 -0000 1.284.2.163 +++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 22 Jul 2021 20:11:39 -0000 1.284.2.164 @@ -3156,7 +3156,7 @@ # set the editor value from the spec, because the field class is # parsed before other options. Getting here without an editor, # will cause the code to fallback to the default from the global - # parameter, de-facto ingnoring the 'editor=' spec. One quick + # parameter, de-facto ignoring the 'editor=' spec. One quick # solution is to parse the spec here. regexp {,?editor=([^,]+)} ${:spec} m :editor @@ -3439,9 +3439,9 @@ {callback "/* callback code */"} {destroy_callback "/* callback code */"} {submit_callback ""} - {extraPlugins "xowikiimage"} + {extraPlugins ""} {extraAllowedContent {*(*)}} - {ck_package standard-all} + {ck_package standard} {templatesFiles ""} {templates ""} {contentsCss /resources/xowiki/ck_contents.css} @@ -3552,10 +3552,26 @@ # CDN. If we do not use standard-all, then we see an error # about a missing # ".../4.9.2/full/plugins/iframedialog/plugin.js". There - # exists a "iframe" and a "iframedialog" plugin for ckeditor4, - # the latter is not included in the standard builds (only in - # "-all"). + # exists a default "iframe" and a "iframedialog" plugin for + # ckeditor4, the latter is not included in the standard builds + # (only in "-all"). # + # UPDATE July 2021: The "*-all" ckpackages are gone for newer + # versions of CKEditor (e.g. 4.16.*) and it is unlikely that + # it will be revived for the standard packages. One can + # download the "iframedialog" plugin still from the addons + # + # https://ckeditor.com/cke4/addon/iframedialog + # + # and add it manually to the downloaded tree in e.g. + # + # richtext-ckeditor4/www/resources/4.16.1/standard/plugins/ + # + # For the time being, we remove the "xowikiimage" plugin from + # the extraPlugins to make it working out of the box. This + # plugin should be rewritten using the current dialogs of + # ckeditor. + # ::richtext::ckeditor4::add_editor \ -order 90 \ -ck_package ${:ck_package} \