vanilla ckeditor-3.5.4

[ckeditor.git] / _source / plugins / entities / plugin.js

diff --git a/_source/plugins/entities/plugin.js b/_source/plugins/entities/plugin.js
index 558d824..f8329cd 100644 (file)
--- a/_source/plugins/entities/plugin.js
+++ b/_source/plugins/entities/plugin.js
@@ -1,16 +1,16 @@
 /*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
 (function()\r
 {\r
        // Base HTML entities.\r
-       var htmlbase = 'nbsp,gt,lt,quot';\r
+       var htmlbase = 'nbsp,gt,lt';\r
 \r
        var entities =\r
                // Latin-1 Entities\r
-               'iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,' +\r
+               'quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,' +\r
                'not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,' +\r
                'cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,' +\r
 \r
@@ -74,7 +74,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                return '';\r
                        });\r
 \r
-               if ( !reverse )\r
+               if ( !reverse && entities )\r
                {\r
                        // Transforms the entities string into an array.\r
                        entities = entities.split( ',' );\r
@@ -171,6 +171,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
 /**\r
  * Whether to use HTML entities in the output.\r
+ * @name CKEDITOR.config.entities\r
  * @type Boolean\r
  * @default true\r
  * @example\r
@@ -182,6 +183,7 @@ CKEDITOR.config.entities = true;
  * Whether to convert some Latin characters (Latin alphabet No. 1, ISO 8859-1)\r
  * to HTML entities. The list of entities can be found at the\r
  * <a href="http://www.w3.org/TR/html4/sgml/entities.html#h-24.2.1">W3C HTML 4.01 Specification, section 24.2.1</a>.\r
+ * @name CKEDITOR.config.entities_latin\r
  * @type Boolean\r
  * @default true\r
  * @example\r
@@ -194,6 +196,7 @@ CKEDITOR.config.entities_latin = true;
  * HTML entities. This may be more relevant for users typing text written in Greek.\r
  * The list of entities can be found at the\r
  * <a href="http://www.w3.org/TR/html4/sgml/entities.html#h-24.3.1">W3C HTML 4.01 Specification, section 24.3.1</a>.\r
+ * @name CKEDITOR.config.entities_greek\r
  * @type Boolean\r
  * @default true\r
  * @example\r
@@ -207,7 +210,7 @@ CKEDITOR.config.entities_greek = true;
  * When specified as the value 'force', it will simply convert all entities into the above form.\r
  * For example, the phrase "This is Chinese: &#27721;&#35821;." is outputted\r
  * as "This is Chinese: &amp;#27721;&amp;#35821;."\r
- * @type Boolean\r
+ * @name CKEDITOR.config.entities_processNumerical\r
  * @type Boolean|String\r
  * @default false\r
  * @example\r
@@ -219,6 +222,7 @@ CKEDITOR.config.entities_greek = true;
  * An additional list of entities to be used. It's a string containing each\r
  * entry separated by a comma. Entities names or number must be used, exclusing\r
  * the "&amp;" preffix and the ";" termination.\r
+ * @name CKEDITOR.config.entities_additional\r
  * @default '#39'  // The single quote (') character.\r
  * @type String\r
  * @example\r