[Checkins] SVN: zope.html/trunk/src/zope/html/ 1. Upgraded CKEditor to latest (3.2.1) from v3.0.

Satchidanand Haridas satchit at zope.com
Tue May 25 13:29:16 EDT 2010


Log message for revision 112710:
  1. Upgraded CKEditor to latest (3.2.1) from v3.0.
  
  2. Added configuration to use un-minified version of CKEditor when using "dev" mode.
  
  

Changed:
  D   zope.html/trunk/src/zope/html/ckeditor/3.0/
  A   zope.html/trunk/src/zope/html/ckeditor/3.2.1/
  U   zope.html/trunk/src/zope/html/configure.zcml
  U   zope.html/trunk/src/zope/html/widget.py
  U   zope.html/trunk/src/zope/html/widget.txt

-=-
Modified: zope.html/trunk/src/zope/html/configure.zcml
===================================================================
--- zope.html/trunk/src/zope/html/configure.zcml	2010-05-25 17:20:13 UTC (rev 112709)
+++ zope.html/trunk/src/zope/html/configure.zcml	2010-05-25 17:29:16 UTC (rev 112710)
@@ -1,6 +1,7 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="zope.html"
     >
 
@@ -73,9 +74,15 @@
 
   <resourceLibrary name="ckeditor">
     <directory
+        zcml:condition="have devmode"
         source="ckeditor"
-        include="3.0/ckeditor/ckeditor.js"
+        include="3.2.1/ckeditor/ckeditor_source.js"
         />
+    <directory
+        zcml:condition="not-have devmode"
+        source="ckeditor"
+        include="3.2.1/ckeditor/ckeditor.js"
+        />
   </resourceLibrary>
 
 </configure>

Modified: zope.html/trunk/src/zope/html/widget.py
===================================================================
--- zope.html/trunk/src/zope/html/widget.py	2010-05-25 17:20:13 UTC (rev 112709)
+++ zope.html/trunk/src/zope/html/widget.py	2010-05-25 17:29:16 UTC (rev 112710)
@@ -63,7 +63,7 @@
 class CkeditorWidget(zope.app.form.browser.TextAreaWidget):
 
     editorHeight = 400
-    fckVersion = '3.0'
+    fckVersion = '3.2.1'
 
     configurationPath = "/@@/zope_ckconfig.js"
 

Modified: zope.html/trunk/src/zope/html/widget.txt
===================================================================
--- zope.html/trunk/src/zope/html/widget.txt	2010-05-25 17:20:13 UTC (rev 112709)
+++ zope.html/trunk/src/zope/html/widget.txt	2010-05-25 17:29:16 UTC (rev 112710)
@@ -42,6 +42,11 @@
   >>> ckwidget.configurationPath = "/myconfig.js"
   >>> ckwidget.editorHeight = 200
 
+The "fckVersion" attribute holds the version of CKEditor library.
+
+  >>> ckwidget.fckVersion
+  '3.2.1'
+
   >>> print ckwidget()
   <textarea...></textarea>
   <script...



More information about the checkins mailing list