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 -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/richtext-ckeditor4/richtext-ckeditor4.info	29 Oct 2016 13:43:02 -0000	1.1.2.8
+++ openacs-4/packages/richtext-ckeditor4/richtext-ckeditor4.info	4 Jan 2017 11:39:29 -0000	1.1.2.9
@@ -9,13 +9,13 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>f</inherit-templates-p>
     
-    <version name="0.8" url="http://openacs.org/repository/download/apm/richtext-ckeditor4-0.8.apm">
+    <version name="0.9" url="http://openacs.org/repository/download/apm/richtext-ckeditor4-0.9.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>Richtext editor plugin for integrating CKeditor 4 with acs-templating</summary>
         <release-date>2016-09-05</release-date>
         <maturity>2</maturity>
 
-        <provides url="richtext-ckeditor4" version="0.8"/>
+        <provides url="richtext-ckeditor4" version="0.9"/>
         <requires url="acs-templating" version="5.9.1d3"/>
         <requires url="acs-tcl" version="5.9.1d12"/>
 
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 -r1.1.2.11 -r1.1.2.12
--- openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl	16 Nov 2016 12:43:12 -0000	1.1.2.11
+++ openacs-4/packages/richtext-ckeditor4/tcl/richtext-procs.tcl	4 Jan 2017 11:39:29 -0000	1.1.2.12
@@ -14,7 +14,7 @@
 
 namespace eval ::richtext::ckeditor4 {
 
-    set version 4.5.11
+    set version 4.6.1
     set ck_package standard
     
     ad_proc initialize_widget {
@@ -118,21 +118,13 @@
         #
     }
 
-    
-    ad_proc ::richtext::ckeditor4::add_editor {
+    ad_proc ::richtext::ckeditor4::version_info {
         {-ck_package ""}
         {-version ""}
     } {
 
-        Add the necessary JavaScript and other files to the current
-        page. The naming is modeled after "add_script", "add_css",
-        ... but is intended to care about everything necessary,
-        including the content security policies. Similar naming
-        conventions should be used for other editors as well.
-
-        This function can be as well used from other packages, such
-        e.g. from the xowiki form-fields, which provide a much higher
-        customization.
+        Get information about available version(s) of CKEditor, either
+        from the local file system, or from CDN.
         
     } {
         #
@@ -150,9 +142,38 @@
         set resources $::acs::rootdir/packages/richtext-ckeditor4/www/resources
         
         if {[file exists $resources/$suffix]} {
-            template::head::add_javascript -src "/resources/richtext-ckeditor4/$suffix"
+            lappend result file $resources/$suffix
+            lappend result resources /resources/richtext-ckeditor4/$suffix
+        }
+        lappend result cdn "//cdn.ckeditor.com/$suffix"
+
+        return $result
+    }
+    
+    ad_proc ::richtext::ckeditor4::add_editor {
+        {-ck_package ""}
+        {-version ""}
+    } {
+
+        Add the necessary JavaScript and other files to the current
+        page. The naming is modeled after "add_script", "add_css",
+        ... but is intended to care about everything necessary,
+        including the content security policies. Similar naming
+        conventions should be used for other editors as well.
+
+        This function can be as well used from other packages, such
+        e.g. from the xowiki form-fields, which provide a much higher
+        customization.
+        
+    } {
+        set version_info [::richtext::ckeditor4::version_info \
+                              -ck_package $ck_package \
+                              -version $version]
+
+        if {[dict exists $version_info resources]} {
+            template::head::add_javascript -src [dict get $version_info resources]
         } else {
-            template::head::add_javascript -src "//cdn.ckeditor.com/$suffix"
+            template::head::add_javascript -src [dict get $version_info cdn]
             security::csp::require script-src cdn.ckeditor.com
             security::csp::require style-src cdn.ckeditor.com
             security::csp::require img-src cdn.ckeditor.com
@@ -191,7 +212,7 @@
             set ck_package ${::richtext::ckeditor4::ck_package}
         }
 
-        set download_url http://download.cksource.com/CKEditor/CKEditor/CKEditor%20${version}/ckeditor_${version}_${cp_package}.zip
+        set download_url http://download.cksource.com/CKEditor/CKEditor/CKEditor%20${version}/ckeditor_${version}_${ck_package}.zip
         set resources $::acs::rootdir/packages/richtext-ckeditor4/www/resources
 
         #
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/download.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/richtext-ckeditor4/www/sitewide-admin/index.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?