Index: openacs-4/packages/richtext-ckeditor4/richtext-ckeditor4.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-ckeditor4/richtext-ckeditor4.info,v diff -u -N -r1.1.2.7 -r1.1.2.8 --- openacs-4/packages/richtext-ckeditor4/richtext-ckeditor4.info 13 Sep 2016 08:33:09 -0000 1.1.2.7 +++ openacs-4/packages/richtext-ckeditor4/richtext-ckeditor4.info 29 Oct 2016 13:43:02 -0000 1.1.2.8 @@ -9,13 +9,13 @@ f f - + Gustaf Neumann Richtext editor plugin for integrating CKeditor 4 with acs-templating 2016-09-05 - 0 + 2 - + 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.1.2.7 -r1.1.2.8 --- openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 13 Sep 2016 08:33:09 -0000 1.1.2.7 +++ openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl 29 Oct 2016 13:43:02 -0000 1.1.2.8 @@ -25,6 +25,12 @@ } { ns_log debug "initialize CKEditor instance with <$options>" + # allow per default all classes, unless the user has specified + # it differently + if {![dict exists $options extraAllowedContent]} { + dict set options extraAllowedContent {*(*)} + } + # The richtext widget might be specified by "options {editor # ckeditor4}" or via the package parameter "RichTextEditor" of # acs-templating. @@ -60,6 +66,10 @@ if {[dict exists options customConfig]} { lappend ckOptionsList "customConfig: '[dict get $options customConfig]'" } + if {[dict exists options extraAllowedContent]} { + lappend ckOptionsList "extraAllowedContent: '[dict get $options extraAllowedContent]'" + } + set ckOptions [join $ckOptionsList ", "] # @@ -69,7 +79,7 @@ CKEDITOR.replace( '$text_id', {$ckOptions} ); }] - template::head::add_javascript -src "//cdn.ckeditor.com/4.5.10/standard/ckeditor.js" + template::head::add_javascript -src "//cdn.ckeditor.com/4.5.11/standard/ckeditor.js" # # add required directives for content security policies