Skip to content

Commit 5fae8c8

Browse files
author
shaunsephton
committed
ckeditor update
1 parent 0e4a8c3 commit 5fae8c8

File tree

537 files changed

+41774
-15123
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

537 files changed

+41774
-15123
lines changed

‎ckeditor/media/ckeditor/ckeditor/.htaccess

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#
2+
# Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
3+
# For licensing, see LICENSE.html or http://ckeditor.com/license
4+
#
5+
6+
#
7+
# On some specific Linux installations you could face problems with Firefox.
8+
# It could give you errors when loading the editor saying that some illegal
9+
# characters were found (three strange chars in the beginning of the file).
10+
# This could happen if you map the .js or .css files to PHP, for example.
11+
#
12+
# Those characters are the Byte Order Mask (BOM) of the Unicode encoded files.
13+
# All FCKeditor files are Unicode encoded.
14+
#
15+
16+
AddType application/x-javascript .js
17+
AddType text/css .css
18+
19+
#
20+
# If PHP is mapped to handle XML files, you could have some issues. The
21+
# following will disable it.
22+
#
23+
24+
AddType text/xml .xml

‎ckeditor/media/ckeditor/ckeditor/CHANGES.html

Lines changed: 1268 additions & 373 deletions
Large diffs are not rendered by default.

‎ckeditor/media/ckeditor/ckeditor/INSTALL.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<!--
3-
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
3+
Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
44
For licensing, see LICENSE.html or http://ckeditor.com/license
55
-->
66
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -84,7 +84,7 @@ <h3>
8484
CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
8585
</p>
8686
<p id="copy">
87-
Copyright &copy; 2003-2010, <a href="http://cksource.com/">CKSource</a> - Frederico
87+
Copyright &copy; 2003-2011, <a href="http://cksource.com/">CKSource</a> - Frederico
8888
Knabben. All rights reserved.
8989
</p>
9090
</div>

‎ckeditor/media/ckeditor/ckeditor/LICENSE.html

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
==========================
88
99
CKEditor - The text editor for Internet - http://ckeditor.com
10-
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
10+
Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
1111
1212
Licensed under the terms of any of the following licenses at your
1313
choice:
@@ -28,9 +28,7 @@
2828
license you have chosen to be bound to when using, reproducing,
2929
modifying and distributing this software, just include a text file
3030
titled "legal.txt" in your version of this software, indicating your
31-
license choice. In any case, your choice will not restrict any
32-
recipient of your version of this software to use, reproduce, modify
33-
and distribute this software under any of the above licenses.
31+
license choice.
3432
3533
Sources of Intellectual Property Included in CKEditor
3634
=====================================================
@@ -40,11 +38,6 @@
4038
property. In some specific instances, CKEditor will incorporate work
4139
done by developers outside of CKSource with their express permission.
4240
43-
YUI Test: At _source/tests/yuitest.js can be found part of the source
44-
code of YUI, which is licensed under the terms of the BSD License
45-
(http://developer.yahoo.com/yui/license.txt). YUI is Copyright (C)
46-
2008, Yahoo! Inc.
47-
4841
Trademarks
4942
==========
5043
@@ -1286,7 +1279,7 @@ <h1>
12861279
<p>
12871280
<strong>CKEditor&trade;</strong> - The text editor for Internet&trade; - <a href="http://ckeditor.com">
12881281
http://ckeditor.com</a><br />
1289-
Copyright &copy; 2003-2010, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
1282+
Copyright &copy; 2003-2011, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved.
12901283
</p>
12911284
<p>
12921285
Licensed under the terms of any of the following licenses at your choice:

‎ckeditor/media/ckeditor/ckeditor/_samples/adobeair/application.xml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<!--
3+
Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
4+
For licensing, see LICENSE.html or http://ckeditor.com/license
5+
-->
6+
<application xmlns="http://ns.adobe.com/air/application/1.0">
7+
<id>com.ckeditor.air.sample</id>
8+
<name>CKEditor - Adobe AIR Sample Application</name>
9+
<version>1.0</version>
10+
<filename>CKEditor AIR Samples</filename>
11+
<description>This is a sample AIR application of CKEditor.</description>
12+
<copyright>Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.</copyright>
13+
<initialWindow>
14+
<content>_samples/adobeair/sample.html</content>
15+
<title>CKEditor - Adobe AIR Sample</title>
16+
<systemChrome>standard</systemChrome>
17+
<transparent>false</transparent>
18+
<visible>true</visible>
19+
<minimizable>true</minimizable>
20+
<maximizable>true</maximizable>
21+
<resizable>true</resizable>
22+
<x>100</x>
23+
<y>80</y>
24+
<width>950</width>
25+
<height>700</height>
26+
<minSize>900 600</minSize>
27+
</initialWindow>
28+
<installFolder>CKEditor/Sample AIR Application</installFolder>
29+
<programMenuFolder>CKEditor/Sample AIR Application</programMenuFolder>
30+
<customUpdateUI>false</customUpdateUI>
31+
<allowBrowserInvocation>false</allowBrowserInvocation>
32+
</application>

‎ckeditor/media/ckeditor/ckeditor/_samples/adobeair/run.bat

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@ECHO OFF
2+
::
3+
:: Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
4+
:: For licensing, see LICENSE.html or http://ckeditor.com/license
5+
::
6+
:: Use this file to quickly run the sample in a Windows environment.
7+
::
8+
9+
adl application.xml ../../

‎ckeditor/media/ckeditor/ckeditor/_samples/adobeair/run.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
3+
# Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
4+
# For licensing, see LICENSE.html or http://ckeditor.com/license
5+
6+
# Use this file to quickly run the sample under Linux.
7+
8+
adl application.xml ../../

‎ckeditor/media/ckeditor/ckeditor/_samples/adobeair/sample.html

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2+
<!--
3+
Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
4+
For licensing, see LICENSE.html or http://ckeditor.com/license
5+
-->
6+
<html xmlns="http://www.w3.org/1999/xhtml">
7+
<head>
8+
<title>Replace Textarea by Code - CKEditor Sample</title>
9+
<meta content="text/html; charset=utf-8" http-equiv="content-type" />
10+
<script type="text/javascript" src="../../ckeditor.js"></script>
11+
<link href="../sample.css" rel="stylesheet" type="text/css" />
12+
<style type="text/css">
13+
body { margin: 10px ; }
14+
</style></head>
15+
<body>
16+
<h1 class="samples">
17+
CKEditor - Adobe AIR Sample
18+
</h1>
19+
<p>
20+
This is a sample HTML/JavaScript Adobe AIR application with CKEditor with default features.
21+
</p>
22+
<p>
23+
<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>
24+
<script type="text/javascript">
25+
//<![CDATA[
26+
27+
// Replace the <textarea id="editor"> with an CKEditor
28+
// instance, using default configurations.
29+
CKEDITOR.replace( 'editor1' );
30+
31+
//]]>
32+
</script>
33+
</p>
34+
<div id="footer" style="position:absolute;bottom:0;left:0;right:0;width:100%;padding-bottom:10px;">
35+
<hr />
36+
<p>
37+
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>
38+
</p>
39+
<p id="copy">
40+
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
41+
Knabben. All rights reserved.
42+
</p>
43+
</div>
44+
</body>
45+
</html>

‎ckeditor/media/ckeditor/ckeditor/_samples/ajax.html

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,29 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
22
<!--
3-
Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
3+
Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
44
For licensing, see LICENSE.html or http://ckeditor.com/license
55
-->
66
<html xmlns="http://www.w3.org/1999/xhtml">
77
<head>
8-
<title>Ajax - CKEditor Sample</title>
8+
<title>Ajax &mdash; CKEditor Sample</title>
99
<meta content="text/html; charset=utf-8" http-equiv="content-type" />
1010
<script type="text/javascript" src="../ckeditor.js"></script>
1111
<script src="sample.js" type="text/javascript"></script>
1212
<link href="sample.css" rel="stylesheet" type="text/css" />
1313
<script type="text/javascript">
1414
//<![CDATA[
1515

16-
var editor;
16+
var editor, html = '';
1717

1818
function createEditor()
1919
{
2020
if ( editor )
2121
return;
2222

23-
var html = document.getElementById( 'editorcontents' ).innerHTML;
2423

25-
// Create a new editor inside the <div id="editor">
26-
editor = CKEDITOR.appendTo( 'editor' );
27-
editor.setData( html );
28-
29-
// This sample may break here if the ckeditor_basic.js is used. In such case, the following code should be used instead:
30-
/*
31-
if ( editor.setData )
32-
editor.setData( html );
33-
else
34-
{
35-
CKEDITOR.on( 'loaded', function()
36-
{
37-
editor.setData( html );
38-
});
39-
}
40-
*/
24+
// Create a new editor inside the <div id="editor">, setting its value to html
25+
var config = {};
26+
editor = CKEDITOR.appendTo( 'editor', config, html );
4127
}
4228

4329
function removeEditor()
@@ -47,7 +33,7 @@
4733

4834
// Retrieve the editor contents. In an Ajax application, this data would be
4935
// sent to the server or used in any other way.
50-
document.getElementById( 'editorcontents' ).innerHTML = editor.getData();
36+
document.getElementById( 'editorcontents' ).innerHTML = html = editor.getData();
5137
document.getElementById( 'contents' ).style.display = '';
5238

5339
// Destroy the editor.
@@ -59,9 +45,20 @@
5945
</script>
6046
</head>
6147
<body>
62-
<h1>
63-
CKEditor Sample
48+
<h1 class="samples">
49+
CKEditor Sample &mdash; Create and Destroy Editor Instances for Ajax Applications
6450
</h1>
51+
<div class="description">
52+
<p>
53+
This sample shows how to create and destroy CKEditor instances on the fly. After the removal of CKEditor the content created inside the editing
54+
area will be displayed in a <code>&lt;div&gt;</code> element.
55+
</p>
56+
<p>
57+
For details of how to create this setup check the source code of this sample page
58+
for JavaScript code responsible for the creation and destruction of a CKEditor instance.
59+
</p>
60+
</div>
61+
6562
<!-- This <div> holds alert messages to be display in the sample page. -->
6663
<div id="alerts">
6764
<noscript>
@@ -72,6 +69,7 @@ <h1>
7269
</p>
7370
</noscript>
7471
</div>
72+
<p>Click the buttons to create and remove a CKEditor instance.</p>
7573
<p>
7674
<input onclick="createEditor();" type="button" value="Create Editor" />
7775
<input onclick="removeEditor();" type="button" value="Remove Editor" />
@@ -89,10 +87,10 @@ <h1>
8987
<div id="footer">
9088
<hr />
9189
<p>
92-
CKEditor - The text editor for Internet - <a href="http://ckeditor.com/">http://ckeditor.com</a>
90+
CKEditor - The text editor for the Internet - <a class="samples" href="http://ckeditor.com/">http://ckeditor.com</a>
9391
</p>
9492
<p id="copy">
95-
Copyright &copy; 2003-2010, <a href="http://cksource.com/">CKSource</a> - Frederico
93+
Copyright &copy; 2003-2011, <a class="samples" href="http://cksource.com/">CKSource</a> - Frederico
9694
Knabben. All rights reserved.
9795
</p>
9896
</div>

0 commit comments

Comments
 (0)