- Upgraded CKEditor to 3.5.2.

- Removed deprecation warnings. - Get ready for release.
zopefoundation · Mar 2, 2011 · 8edb30b · 8edb30b
1 parent 0775ce6
commit 8edb30b
Show file tree

Hide file tree

Showing 496 changed files with 45,641 additions and 21,159 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -3,9 +3,13 @@ CHANGES
 =======
 
 
-1.1.0 (2009-??-??)
+1.1.0 (2011-03-02)
 ------------------
 
+- Upgraded CKEditor to 3.5.2.
+
+- Removed deprecation warnings.
+
 
 1.0.0 (2009-11-03)
 ------------------

diff --git a/setup.py b/setup.py
@@ -12,8 +12,6 @@
 #
 ##############################################################################
 """Setup
-
-$Id$
 """
 import os
 from setuptools import setup, find_packages
@@ -23,7 +21,7 @@ def read(*rnames):
 
 setup (
     name='z3c.formwidget.ckeditor',
-    version='1.1.0dev',
+    version='1.1.0',
     author = "Stephan Richter and the Zope Community",
     author_email = "zope-dev@zope.org",
     description = "A CKEditor widget for text fields using z3c.form",

diff --git a/src/z3c/formwidget/ckeditor/ckeditor-js/CHANGES.html b/src/z3c/formwidget/ckeditor/ckeditor-js/CHANGES.html
diff --git a/src/z3c/formwidget/ckeditor/ckeditor-js/INSTALL.html b/src/z3c/formwidget/ckeditor/ckeditor-js/INSTALL.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -84,7 +84,7 @@ <h3>
 			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico
+			Copyright &copy; 2003-2011, <a href="http://cksource.com/">CKSource</a> - Frederico
 			Knabben. All rights reserved.
 		</p>
 	</div>

diff --git a/src/z3c/formwidget/ckeditor/ckeditor-js/LICENSE.html b/src/z3c/formwidget/ckeditor/ckeditor-js/LICENSE.html
@@ -7,7 +7,7 @@
 ==========================
 
 CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:
@@ -1286,7 +1286,7 @@ <h1>
 	<p>
 		<strong>CKEditor&trade;</strong> - The text editor for Internet&trade; - <a href="http://ckeditor.com">
 			http://ckeditor.com</a><br />
-		Copyright &copy; 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
+		Copyright &copy; 2003-2011, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
 	</p>
 	<p>
 		Licensed under the terms of any of the following licenses at your choice:

diff --git a/src/z3c/formwidget/ckeditor/ckeditor-js/_samples/adobeair/application.xml b/src/z3c/formwidget/ckeditor/ckeditor-js/_samples/adobeair/application.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<application xmlns="http://ns.adobe.com/air/application/1.0">
+	<id>com.ckeditor.air.sample</id>
+	<name>CKEditor - Adobe AIR Sample Application</name>
+	<version>1.0</version>
+	<filename>CKEditor AIR Samples</filename>
+	<description>This is a sample AIR application of CKEditor.</description>
+	<copyright>Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.</copyright>
+	<initialWindow>
+		<content>_samples/adobeair/sample.html</content>
+		<title>CKEditor - Adobe AIR Sample</title>
+		<systemChrome>standard</systemChrome>
+		<transparent>false</transparent>
+		<visible>true</visible>
+		<minimizable>true</minimizable>
+		<maximizable>true</maximizable>
+		<resizable>true</resizable>
+		<x>100</x>
+		<y>80</y>
+		<width>950</width>
+		<height>700</height>
+		<minSize>900 600</minSize>
+	</initialWindow>
+	<installFolder>CKEditor/Sample AIR Application</installFolder>
+	<programMenuFolder>CKEditor/Sample AIR Application</programMenuFolder>
+	<customUpdateUI>false</customUpdateUI>
+	<allowBrowserInvocation>false</allowBrowserInvocation>
+</application>
diff --git a/src/z3c/formwidget/ckeditor/ckeditor-js/_samples/adobeair/run.bat b/src/z3c/formwidget/ckeditor/ckeditor-js/_samples/adobeair/run.bat
@@ -0,0 +1,9 @@
+@ECHO OFF
+::
+:: Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+:: For licensing, see LICENSE.html or http://ckeditor.com/license
+::
+:: Use this file to quickly run the sample in a Windows environment.
+::
+
+adl application.xml ../../
diff --git a/src/z3c/formwidget/ckeditor/ckeditor-js/_samples/adobeair/run.sh b/src/z3c/formwidget/ckeditor/ckeditor-js/_samples/adobeair/run.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+# For licensing, see LICENSE.html or http://ckeditor.com/license
+
+# Use this file to quickly run the sample under Linux.
+
+adl application.xml ../../
diff --git a/src/z3c/formwidget/ckeditor/ckeditor-js/_samples/adobeair/sample.html b/src/z3c/formwidget/ckeditor/ckeditor-js/_samples/adobeair/sample.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Replace Textarea by Code - CKEditor Sample</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
+	<script type="text/javascript" src="../../ckeditor.js"></script>
+	<link href="../sample.css" rel="stylesheet" type="text/css" />
+	<style type="text/css">
+		body { margin: 10px ; }
+	</style></head>
+<body>
+	<h1 class="samples">
+		CKEditor - Adobe AIR Sample
+	</h1>
+	<p>
+		This is a sample HTML/JavaScript Adobe AIR application with CKEditor with default features.
+	</p>
+	<p>
+		<textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+		<script type="text/javascript">
+		//<![CDATA[
+
+			// Replace the <textarea id="editor"> with an CKEditor
+			// instance, using default configurations.
+			CKEDITOR.replace( 'editor1' );
+
+		//]]>
+		</script>
+	</p>
+	<div id="footer" style="position:absolute;bottom:0;left:0;right:0;width:100%;padding-bottom:10px;">
+		<hr />
+		<p>
+			CKEditor - The text editor for Internet - <a class="samples" href="#" onclick="window.runtime.flash.net.navigateToURL(new window.runtime.flash.net.URLRequest('http://ckeditor.com/'));return false;">http://ckeditor.com</a>
+		</p>
+		<p id="copy">
+			Copyright &copy; 2003-2011, <a class="samples" href="#" onclick="window.runtime.flash.net.navigateToURL(new window.runtime.flash.net.URLRequest('http://cksource.com/'));return false;">CKSource</a> - Frederico
+			Knabben. All rights reserved.
+		</p>
+	</div>
+</body>
+</html>
diff --git a/src/z3c/formwidget/ckeditor/ckeditor-js/_samples/ajax.html b/src/z3c/formwidget/ckeditor/ckeditor-js/_samples/ajax.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>Sample - CKEditor</title>
-	<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+	<title>Ajax &mdash; CKEditor Sample</title>
+	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
 	<script type="text/javascript" src="../ckeditor.js"></script>
 	<script src="sample.js" type="text/javascript"></script>
-	<link href="sample.css" rel="stylesheet" type="text/css"/>
-	<script id="headscript" type="text/javascript">
+	<link href="sample.css" rel="stylesheet" type="text/css" />
+	<script type="text/javascript">
 	//<![CDATA[
 
 var editor;
@@ -22,20 +22,9 @@
 
 	var html = document.getElementById( 'editorcontents' ).innerHTML;
 
-	// Create a new editor inside the <div id="editor">
-	editor = CKEDITOR.appendTo( 'editor' );
-	editor.setData( html );
-
-	// This sample may break here if the ckeditor_basic.js is used. In such case, the following code should be used instead:
-	/*
-	if ( editor.setData )
-		editor.setData( html );
-	else
-		CKEDITOR.on( 'loaded', function()
-			{
-				editor.setData( html );
-			});
-	*/
+	// Create a new editor inside the <div id="editor">, setting its value to html
+	var config = {};
+	editor = CKEDITOR.appendTo( 'editor', config, html );
 }
 
 function removeEditor()
@@ -57,9 +46,20 @@
 	</script>
 </head>
 <body>
-	<h1>
-		CKEditor Sample
+	<h1 class="samples">
+		CKEditor Sample &mdash; Create and Destroy Editor Instances for Ajax Applications
 	</h1>
+	<div class="description">
+	<p>
+		This sample shows how to create and destroy CKEditor instances on the fly. After the removal of CKEditor the content created inside the editing
+		area will be displayed in a <code>&lt;div&gt;</code> element.
+	</p>
+	<p>
+		For details of how to create this setup check the source code of this sample page
+		for JavaScript code responsible for the creation and destruction of a CKEditor instance.
+	</p>
+	</div>
+
 	<!-- This <div> holds alert messages to be display in the sample page. -->
 	<div id="alerts">
 		<noscript>
@@ -70,25 +70,29 @@ <h1>
 			</p>
 		</noscript>
 	</div>
-	<!-- This <fieldset> holds the HTML that you will usually find in your
-	     pages. -->
+	<p>Click the buttons to create and remove a CKEditor instance.</p>
 	<p>
-			<input onclick="createEditor();" type="button" value="Create Editor"/>
-			<input onclick="removeEditor();" type="button" value="Remove Editor"/>
-		</p>
-		<div id="editor">
-		</div>
-		<div id="contents" style="display: none">
-			<p>Edited Contents:</p>
-			<div id="editorcontents"/>
+		<input onclick="createEditor();" type="button" value="Create Editor" />
+		<input onclick="removeEditor();" type="button" value="Remove Editor" />
+	</p>
+	<!-- This div will hold the editor. -->
+	<div id="editor">
+	</div>
+	<div id="contents" style="display: none">
+		<p>
+			Edited Contents:</p>
+		<!-- This div will be used to display the editor contents. -->
+		<div id="editorcontents">
 		</div>
+	</div>
 	<div id="footer">
-		<hr/>
+		<hr />
 		<p>
-			CKEditor - The text editor for Internet - <a href="http://ckeditor.com/" shape="rect">http://ckeditor.com</a>
+			CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
 		</p>
 		<p id="copy">
-			Copyright © 2003-2009, <a href="http://cksource.com/" shape="rect">CKSource</a> - Frederico Knabben. All rights reserved.
+			Copyright &copy; 2003-2011, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
+			Knabben. All rights reserved.
 		</p>
 	</div>
 </body>