Skip to content

Commit

Permalink
Final commit for CKEditor for WordPress 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wwalc committed Dec 19, 2012
1 parent 5daeb54 commit 431c5ef
Show file tree
Hide file tree
Showing 702 changed files with 4,379 additions and 4,137 deletions.
51 changes: 30 additions & 21 deletions ckeditor.config.js
Expand Up @@ -20,29 +20,38 @@ CKEDITOR.editorConfig = function(config) {
// List of all buttons is here: http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.toolbar_Full

// WordPress basic toolbar
config.toolbar_WordpressBasic = [ [ 'Bold', 'Italic', '-', 'Link', 'Unlink', '-', 'Blockquote' ] ];

// WordPress full toolbar
config.toolbar_WordpressFull = [
['Source'],
['Cut','Copy','Paste','PasteText','PasteFromWord','-','SpellChecker', 'Scayt'],
['Undo','Redo','Find','Replace','-','SelectAll','RemoveFormat'],
['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar'],
'/',
['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
['BidiLtr','BidiRtl'],
['Link','Unlink','Anchor'],
'/',
['Format','Font','FontSize'],
['TextColor','BGColor'],
['Maximize', 'ShowBlocks'],['MediaEmbed'],['Iframe']
];

config.toolbar_WordpressBasic = [
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Strike', '-', 'RemoveFormat' ] },
{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'Blockquote', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight'] },
{ name: 'links', items: [ 'Link', 'Unlink' ] },
{ name: 'insert', items: [ 'Image', 'SpecialChar' ] }
];

// The equivalent of "WordpressFull" toolbar, defined in a way that makes adding buttons from plugins easier.
config.toolbarGroups = [
{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
{ name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
{ name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ] },
// { name: 'forms' },
'/',
{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align' ] },
{ name: 'links' },
{ name: 'insert' },
{ name: 'wordpress' },
'/',
{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
{ name: 'styles' },
{ name: 'colors' },
{ name: 'tools' },
{ name: 'about' }
];

// Remove buttons in "WordpressFull" toolbar
config.WordpressFull_removeButtons = 'Save,NewPage,Preview,Print,Templates,CreateDiv,PageBreak,Subscript,Superscript,Styles';

//IE: remove border of image when is as a link
config.extraCss = "a img { border: 0px\\9; }";

// mediaembed plugin
// config.extraPlugins += (config.extraPlugins ? ',mediaembed' : 'mediaembed' );
// CKEDITOR.plugins.addExternal('mediaembed', ckeditorSettings.pluginPath + 'plugins/mediaembed/');
Expand Down
24 changes: 0 additions & 24 deletions ckeditor/.htaccess

This file was deleted.

1,548 changes: 0 additions & 1,548 deletions ckeditor/CHANGES.html

This file was deleted.

12 changes: 12 additions & 0 deletions ckeditor/CHANGES.md
@@ -0,0 +1,12 @@
CKEditor 4 Changelog
====================

## CKEditor 4.0

The first stable release of the new CKEditor 4 code line.

The CKEditor JavaScript API has been kept compatible with CKEditor 4, whenever
possible. The list of relevant changes can be found in the [API Changes page of
the CKEditor 4 documentation][1].

[1]: http://docs.ckeditor.com/#!/guide/dev_api_changes "API Changes""
115 changes: 26 additions & 89 deletions ckeditor/LICENSE.html → ckeditor/LICENSE.md
@@ -1,8 +1,3 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
== BEGIN TEXT ONLY VERSION ==
Software License Agreement
==========================

Expand All @@ -28,35 +23,39 @@
license you have chosen to be bound to when using, reproducing,
modifying and distributing this software, just include a text file
titled "legal.txt" in your version of this software, indicating your
license choice.
license choice. In any case, your choice will not restrict any
recipient of your version of this software to use, reproduce, modify
and distribute this software under any of the above licenses.

Sources of Intellectual Property Included in CKEditor
=====================================================
-----------------------------------------------------

Where not otherwise indicated, all CKEditor content is authored by
CKSource engineers and consists of CKSource-owned intellectual
property. In some specific instances, CKEditor will incorporate work
done by developers outside of CKSource with their express permission.

Trademarks
==========
----------

CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
and product names are trademarks, registered trademarks or service
marks of their respective holders.

---

Appendix A: The GPL License
===========================
---------------------------

GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Preamble
Preamble

The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Expand Down Expand Up @@ -106,8 +105,8 @@
The precise terms and conditions for copying, distribution and
modification follow.

GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
Expand Down Expand Up @@ -305,7 +304,7 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

NO WARRANTY
NO WARRANTY

11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
Expand All @@ -327,14 +326,14 @@
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS


Appendix B: The LGPL License
============================
----------------------------

GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999

Copyright (C) 1991, 1999 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Expand All @@ -345,7 +344,7 @@
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]

Preamble
Preamble

The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Expand Down Expand Up @@ -447,8 +446,8 @@
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
Expand Down Expand Up @@ -767,7 +766,7 @@
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

NO WARRANTY
NO WARRANTY

15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
Expand All @@ -790,16 +789,14 @@
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS


Appendix C: The MPL License
===========================
---------------------------

MOZILLA PUBLIC LICENSE
Version 1.1
===============
MOZILLA PUBLIC LICENSE
Version 1.1

1. Definitions.

Expand Down Expand Up @@ -1265,63 +1262,3 @@
the notices in the Source Code files of the Original Code. You should
use the text of this Exhibit A rather than the text found in the
Original Code Source Code for Your Modifications.]
== END TEXT ONLY VERSION ==
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>License - CKEditor</title>
</head>
<body>
<h1>
Software License Agreement
</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-2012, <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:
</p>
<ul>
<li><a href="http://www.gnu.org/licenses/gpl.html">GNU General Public License</a> Version
2 or later (the "GPL");</li>
<li><a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>
Version 2.1 or later (the "LGPL");</li>
<li><a href="http://www.mozilla.org/MPL/MPL-1.1.html">Mozilla Public License</a> Version
1.1 or later (the "MPL").</li>
</ul>
<p>
You are not required to, but if you want to explicitly declare the license you have
chosen to be bound to when using, reproducing, modifying and distributing this software,
just include a text file titled "LEGAL" in your version of this software, indicating
your license choice. In any case, your choice will not restrict any recipient of
your version of this software to use, reproduce, modify and distribute this software
under any of the above licenses.
</p>
<h2>
Sources of Intellectual Property Included in CKEditor
</h2>
<p>
Where not otherwise indicated, all CKEditor content is authored by CKSource engineers
and consists of CKSource-owned intellectual property. In some specific instances,
CKEditor will incorporate work done by developers outside of CKSource with their
express permission.
</p>
<p>
<a href="http://developer.yahoo.com/yui/yuitest/">YUI Test</a>: At _source/tests/yuitest.js
can be found part of the source code of YUI, which is licensed under the terms of
the <a href="http://developer.yahoo.com/yui/license.txt">BSD License</a>. YUI is
Copyright &copy; 2008, Yahoo! Inc.
</p>
<h2>
Trademarks
</h2>
<p>
CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product
names are trademarks, registered trademarks or service marks of their respective
holders.
</p>
</body>
</html>

0 comments on commit 431c5ef

Please sign in to comment.