From 1056598c95187351dc58f4991d331e2258d038b5 Mon Sep 17 00:00:00 2001
From: Jason Woofenden
Date: Mon, 26 Sep 2011 00:59:11 -0400
Subject: [PATCH] vanilla ckeditor-3.5.4
---
CHANGES.html | 21 +++
_samples/asp/index.html | 2 +-
_samples/assets/_posteddata.php | 2 +-
_samples/php/index.html | 2 +-
_samples/placeholder.html | 6 +-
_source/core/ckeditor_base.js | 17 +-
_source/core/dom/walker.js | 4 +-
_source/core/dtd.js | 1 -
_source/core/editor.js | 2 +-
_source/core/htmlparser.js | 2 +-
_source/core/htmlparser/fragment.js | 4 +-
_source/core/loader.js | 2 +-
_source/core/plugindefinition.js | 17 ++
_source/core/plugins.js | 14 ++
_source/lang/_translationstatus.txt | 2 +-
_source/lang/sk.js | 88 +++++------
_source/plugins/button/plugin.js | 4 +-
_source/plugins/clipboard/dialogs/paste.js | 192 ++++++++++++-----------
_source/plugins/clipboard/plugin.js | 28 ++--
_source/plugins/colorbutton/plugin.js | 4 +
_source/plugins/colordialog/plugin.js | 22 +--
_source/plugins/dialog/dialogDefinition.js | 18 +++
_source/plugins/dialog/plugin.js | 31 ++++
_source/plugins/entities/plugin.js | 6 +-
_source/plugins/indent/plugin.js | 2 +-
_source/plugins/justify/plugin.js | 11 ++
_source/plugins/pastefromword/plugin.js | 8 +-
_source/plugins/pastetext/dialogs/pastetext.js | 31 ++--
_source/plugins/pastetext/plugin.js | 10 +-
_source/plugins/scayt/plugin.js | 12 +-
_source/plugins/selection/plugin.js | 8 +-
_source/plugins/styles/plugin.js | 19 ++-
_source/plugins/undo/plugin.js | 1 +
_source/plugins/wysiwygarea/plugin.js | 47 +++---
_source/themes/default/theme.js | 10 +-
ckeditor.asp | 6 +-
ckeditor.js | 200 ++++++++++++------------
ckeditor_basic.js | 6 +-
ckeditor_basic_source.js | 2 +-
ckeditor_php4.php | 6 +-
ckeditor_php5.php | 6 +-
ckeditor_source.js | 2 +-
lang/_translationstatus.txt | 2 +-
lang/sk.js | 2 +-
plugins/clipboard/dialogs/paste.js | 4 +-
plugins/pastetext/dialogs/pastetext.js | 2 +-
themes/default/theme.js | 4 +-
47 files changed, 523 insertions(+), 369 deletions(-)
diff --git a/CHANGES.html b/CHANGES.html
index 900c169..b052eae 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -35,6 +35,27 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
CKEditor Changelog
+ CKEditor 3.5.4
+
+ Fixed issues:
+
+ - Added protection against XSS attacks in PHP samples when displaying element names.
+ - #7347 : The Enter key will no longer be caught by the dialog window covering the editor.
+ - #6718 : Paste from Word command overrides the Force Paste as Plain Text configuration.
+ - #6629 : Padding body is no longer needed when the last block is pre-formatted.
+ - #4844 : [IE] Dialog windows fail to load if there are too many editor instances on the page.
+ - #5788 : HTML parser trims empty spaces following
<br>
elements.
+ - #7513 : Invalid markup could cause the editor to hang.
+ - #6109 : Paste and Paste as Plain Text dialog windows now use the standard
commitContent
and setupContent
methods.
+ - #7588 : The editor code now has a protection system to avoid issues when including
ckeditor.js
more than once in the page.
+ - #7322 : Text font plugin now recognizes font family names that contain quotes.
+ - #7540 : Paste from Word introduces wrong spaces.
+ - #7697 : Successive calls of the
replace()
method did not work after SCAYT context menu initialization.
+ - Updated the following language files:
+
+
CKEditor 3.5.3
New features:
diff --git a/_samples/asp/index.html b/_samples/asp/index.html
index a7add8f..76522bf 100644
--- a/_samples/asp/index.html
+++ b/_samples/asp/index.html
@@ -80,7 +80,7 @@ that will be created:
diff --git a/_samples/assets/_posteddata.php b/_samples/assets/_posteddata.php
index 1c029e6..4d3e34e 100644
--- a/_samples/assets/_posteddata.php
+++ b/_samples/assets/_posteddata.php
@@ -39,7 +39,7 @@ foreach ( $postArray as $sForm => $value )
?>
- |
+ |
|
Replace existing textarea elements by code
Replacement of selected textarea elements with CKEditor instances by using a JavaScript call.
- Replace all textarea elements by code
+ Replace all textarea elements by code
Replacement of all textarea elements with CKEditor instances by using a JavaScript call.
Create CKEditor instances in PHP
Creating a CKEditor instance (no initial textarea element is required).
diff --git a/_samples/placeholder.html b/_samples/placeholder.html
index e8055ee..015e01b 100644
--- a/_samples/placeholder.html
+++ b/_samples/placeholder.html
@@ -18,12 +18,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
This sample shows how to configure CKEditor instances to use the
- placeholder plugin that lets you insert read-only elements
+ Placeholder plugin that lets you insert read-only elements
into your content. To enter and modify read-only text, use the
Create Placeholder button and its matching dialog window.
- To add a CKEditor instance that uses the placeholder plugin and a related
+ To add a CKEditor instance that uses the placeholder
plugin and a related
Create Placeholder toolbar button, insert the following JavaScript
call to your code:
@@ -50,7 +50,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license